RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 10:11:01 +00:00
Code Issues Projects Releases Wiki Activity

lavc: Compact the side-data passthrough

Browse Source
This commit is contained in:
Luca Barbato 2014-11-04 21:11:47 +01:00
parent 9a5ac36b69
commit e3e317e0c0
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/utils.c
View File

@ -560,9 +560,15 @@ 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; AVPacket *pkt = avctx->internal->pkt;
uint8_t *packet_sd; int i;
int size; struct {
AVFrameSideData *frame_sd; enum AVPacketSideDataType packet;
enum AVFrameSideDataType frame;
} sd[] = {
{ AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN },
{ AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX },
{ AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D },
};
frame->color_primaries = avctx->color_primaries; frame->color_primaries = avctx->color_primaries;
frame->color_trc = avctx->color_trc; frame->color_trc = avctx->color_trc;
@ -578,32 +584,18 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
frame->pkt_pts = pkt->pts; frame->pkt_pts = pkt->pts;
/* copy the replaygain data to the output frame */ for (i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_REPLAYGAIN, &size); int size;
uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
if (packet_sd) { if (packet_sd) {
frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_REPLAYGAIN, size); AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
sd[i].frame,
size);
if (!frame_sd) if (!frame_sd)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(frame_sd->data, packet_sd, size); memcpy(frame_sd->data, packet_sd, size);
} }
/* copy the displaymatrix to the output frame */
packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_DISPLAYMATRIX, &size);
if (packet_sd) {
frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX, size);
if (!frame_sd)
return AVERROR(ENOMEM);
memcpy(frame_sd->data, packet_sd, size);
}
/* copy the stereo3d format to the output frame */
packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_STEREO3D, &size);
if (packet_sd) {
frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_STEREO3D, size);
if (!frame_sd)
return AVERROR(ENOMEM);
memcpy(frame_sd->data, packet_sd, size);
} }
return 0; return 0;