[FFmpeg-cvslog] avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()
Michael Niedermayer
git at videolan.org
Thu May 1 22:07:30 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 1 21:40:42 2014 +0200| [bbc604020fac64a42f54320876cac6844f3b100d] | committer: Michael Niedermayer
avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbc604020fac64a42f54320876cac6844f3b100d
---
libavcodec/utils.c | 40 ++++++++++++++--------------------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1ed6b96..444b9b2 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -748,10 +748,23 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
{
if (avctx->internal->pkt) {
+ uint8_t *packet_sd;
+ AVFrameSideData *frame_sd;
+ int size;
frame->pkt_pts = avctx->internal->pkt->pts;
av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos);
av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration);
av_frame_set_pkt_size (frame, avctx->internal->pkt->size);
+
+ /* copy the replaygain data to the output frame */
+ packet_sd = av_packet_get_side_data(avctx->internal->pkt, AV_PKT_DATA_REPLAYGAIN, &size);
+ if (packet_sd) {
+ frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_REPLAYGAIN, size);
+ if (!frame_sd)
+ return AVERROR(ENOMEM);
+
+ memcpy(frame_sd->data, packet_sd, size);
+ }
} else {
frame->pkt_pts = AV_NOPTS_VALUE;
av_frame_set_pkt_pos (frame, -1);
@@ -830,32 +843,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
{
- AVPacket *pkt = avctx->internal->pkt;
- uint8_t *packet_sd;
- int size;
- AVFrameSideData *frame_sd;
-
- frame->reordered_opaque = avctx->reordered_opaque;
- if (!pkt) {
- frame->pkt_pts = AV_NOPTS_VALUE;
- av_frame_set_pkt_pos (frame, -1);
- return 0;
- }
-
- frame->pkt_pts = pkt->pts;
- av_frame_set_pkt_size (frame, avctx->internal->pkt->size);
-
- /* copy the replaygain data to the output frame */
- packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_REPLAYGAIN, &size);
- if (packet_sd) {
- frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_REPLAYGAIN, size);
- if (!frame_sd)
- return AVERROR(ENOMEM);
-
- memcpy(frame_sd->data, packet_sd, size);
- }
-
- return 0;
+ return ff_init_buffer_info(avctx, frame);
}
static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
More information about the ffmpeg-cvslog
mailing list