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

lavc: deprecate channel count/layout changing side data

Browse Source 
They are incompatible with the new channel layout scheme and no decoder
uses them.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov 2013-06-05 07:02:53 +02:00 committed by James Almer
parent f423497b45
commit 09b5d3fb44
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/decode.c
View File

@ -91,6 +91,8 @@ static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt)
flags = bytestream_get_le32(&data); flags = bytestream_get_le32(&data);
size -= 4; size -= 4;
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
if (size < 4) if (size < 4)
goto fail; goto fail;
@ -109,6 +111,8 @@ static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt)
avctx->channel_layout = bytestream_get_le64(&data); avctx->channel_layout = bytestream_get_le64(&data);
size -= 8; size -= 8;
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
if (size < 4) if (size < 4)
goto fail; goto fail;

5
libavcodec/packet.h
View File

@ -447,8 +447,13 @@ typedef struct AVPacketList {
#define AV_PKT_FLAG_DISPOSABLE 0x0010 #define AV_PKT_FLAG_DISPOSABLE 0x0010
enum AVSideDataParamChangeFlags { enum AVSideDataParamChangeFlags {
#if FF_API_OLD_CHANNEL_LAYOUT
/**
* @deprecated those are not used by any decoder
*/
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
#endif
AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004, AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004,
AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008, AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008,
}; };

9
libavformat/dump.c
View File

@ -164,8 +164,11 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd)
{ {
int size = sd->size; int size = sd->size;
const uint8_t *data = sd->data; const uint8_t *data = sd->data;
uint32_t flags, channels, sample_rate, width, height; uint32_t flags, sample_rate, width, height;
#if FF_API_OLD_CHANNEL_LAYOUT
uint32_t channels;
uint64_t layout; uint64_t layout;
#endif
if (!data || sd->size < 4) if (!data || sd->size < 4)
goto fail; goto fail;
@ -174,6 +177,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd)
data += 4; data += 4;
size -= 4; size -= 4;
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
if (size < 4) if (size < 4)
goto fail; goto fail;
@ -191,6 +196,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd)
av_log(ctx, AV_LOG_INFO, av_log(ctx, AV_LOG_INFO,
"channel layout: %s, ", av_get_channel_name(layout)); "channel layout: %s, ", av_get_channel_name(layout));
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_OLD_CHANNEL_LAYOUT */
if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
if (size < 4) if (size < 4)
goto fail; goto fail;

2
libavformat/nutenc.c
View File

@ -894,6 +894,7 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
break; break;
case AV_PKT_DATA_PARAM_CHANGE: case AV_PKT_DATA_PARAM_CHANGE:
flags = bytestream_get_le32(&data); flags = bytestream_get_le32(&data);
#if FF_API_OLD_CHANNEL_LAYOUT
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
put_str(dyn_bc, "Channels"); put_str(dyn_bc, "Channels");
put_s(dyn_bc, bytestream_get_le32(&data)); put_s(dyn_bc, bytestream_get_le32(&data));
@ -907,6 +908,7 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
avio_write(dyn_bc, data, 8); data+=8; avio_write(dyn_bc, data, 8); data+=8;
sm_data_count++; sm_data_count++;
} }
#endif
if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
put_str(dyn_bc, "SampleRate"); put_str(dyn_bc, "SampleRate");
put_s(dyn_bc, bytestream_get_le32(&data)); put_s(dyn_bc, bytestream_get_le32(&data));

9
libavformat/utils.c
View File

@ -1329,6 +1329,9 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
uint8_t *data; uint8_t *data;
if (!pkt) if (!pkt)
return AVERROR(EINVAL); return AVERROR(EINVAL);
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
if (channels) { if (channels) {
size += 4; size += 4;
flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT; flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT;
@ -1337,6 +1340,8 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
size += 8; size += 8;
flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT; flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (sample_rate) { if (sample_rate) {
size += 4; size += 4;
flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE; flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
@ -1349,10 +1354,14 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
if (!data) if (!data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
bytestream_put_le32(&data, flags); bytestream_put_le32(&data, flags);
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
if (channels) if (channels)
bytestream_put_le32(&data, channels); bytestream_put_le32(&data, channels);
if (channel_layout) if (channel_layout)
bytestream_put_le64(&data, channel_layout); bytestream_put_le64(&data, channel_layout);
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (sample_rate) if (sample_rate)
bytestream_put_le32(&data, sample_rate); bytestream_put_le32(&data, sample_rate);
if (width || height) { if (width || height) {