generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-01 21:40:42 +02:00
parent 77811482ab
commit bbc604020f
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/utils.c
View File

@@ -748,10 +748,23 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
{ {
if (avctx->internal->pkt) { if (avctx->internal->pkt) {
uint8_t *packet_sd;
AVFrameSideData *frame_sd;
int size;
frame->pkt_pts = avctx->internal->pkt->pts; frame->pkt_pts = avctx->internal->pkt->pts;
av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos); av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos);
av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration); av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration);
av_frame_set_pkt_size (frame, avctx->internal->pkt->size); 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 { } else {
frame->pkt_pts = AV_NOPTS_VALUE; frame->pkt_pts = AV_NOPTS_VALUE;
av_frame_set_pkt_pos (frame, -1); av_frame_set_pkt_pos (frame, -1);
@@ -830,32 +843,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
{ {
AVPacket *pkt = avctx->internal->pkt; return ff_init_buffer_info(avctx, frame);
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;
} }
static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)