Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4c0ece47
Commit
4c0ece47
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
video: use av_write_frame instead of av_interleaved_write_frame
Refs #45601
parent
e243f2ee
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/video/video_encoder.cpp
+8
-8
8 additions, 8 deletions
daemon/src/video/video_encoder.cpp
with
8 additions
and
8 deletions
daemon/src/video/video_encoder.cpp
+
8
−
8
View file @
4c0ece47
...
...
@@ -247,9 +247,9 @@ int VideoEncoder::encode(VideoFrame &input, bool is_keyframe, int64_t frame_numb
pkt
.
stream_index
=
stream_
->
index
;
// write the compressed frame
ret
=
av_
interleaved_
write_frame
(
outputCtx_
,
&
pkt
);
ret
=
av_write_frame
(
outputCtx_
,
&
pkt
);
if
(
ret
<
0
)
print_averror
(
"av_
interleaved_
write_frame"
,
ret
);
print_averror
(
"av_write_frame"
,
ret
);
}
#else
...
...
@@ -279,9 +279,9 @@ int VideoEncoder::encode(VideoFrame &input, bool is_keyframe, int64_t frame_numb
pkt
.
stream_index
=
stream_
->
index
;
// write the compressed frame
ret
=
av_
interleaved_
write_frame
(
outputCtx_
,
&
pkt
);
ret
=
av_write_frame
(
outputCtx_
,
&
pkt
);
if
(
ret
<
0
)
print_averror
(
"av_
interleaved_
write_frame"
,
ret
);
print_averror
(
"av_write_frame"
,
ret
);
#endif // LIBAVCODEC_VERSION_MAJOR >= 54
...
...
@@ -310,9 +310,9 @@ int VideoEncoder::flush()
if
(
pkt
.
size
and
got_packet
)
{
// write the compressed frame
ret
=
av_
interleaved_
write_frame
(
outputCtx_
,
&
pkt
);
ret
=
av_write_frame
(
outputCtx_
,
&
pkt
);
if
(
ret
<
0
)
ERROR
(
"
interleaved_
write_frame failed"
);
ERROR
(
"write_frame failed"
);
}
#else
ret
=
avcodec_encode_video
(
encoderCtx_
,
encoderBuffer_
,
...
...
@@ -327,9 +327,9 @@ int VideoEncoder::flush()
pkt
.
size
=
ret
;
// write the compressed frame
ret
=
av_
interleaved_
write_frame
(
outputCtx_
,
&
pkt
);
ret
=
av_write_frame
(
outputCtx_
,
&
pkt
);
if
(
ret
<
0
)
ERROR
(
"
interleaved_
write_frame failed"
);
ERROR
(
"write_frame failed"
);
#endif
av_free_packet
(
&
pkt
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment