mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 00:32:31 +00:00
avformat/nutdec: Don't create inconsistent side data
Forgotten in 65ddc74988
.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
4037d5e103
commit
87a13986bc
@ -881,8 +881,6 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
|
|||||||
int count = ffio_read_varlen(bc);
|
int count = ffio_read_varlen(bc);
|
||||||
int skip_start = 0;
|
int skip_start = 0;
|
||||||
int skip_end = 0;
|
int skip_end = 0;
|
||||||
int channels = 0;
|
|
||||||
int64_t channel_layout = 0;
|
|
||||||
int sample_rate = 0;
|
int sample_rate = 0;
|
||||||
int width = 0;
|
int width = 0;
|
||||||
int height = 0;
|
int height = 0;
|
||||||
@ -930,7 +928,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
|
|||||||
AV_WB64(dst, v64);
|
AV_WB64(dst, v64);
|
||||||
dst += 8;
|
dst += 8;
|
||||||
} else if (!strcmp(name, "ChannelLayout") && value_len == 8) {
|
} else if (!strcmp(name, "ChannelLayout") && value_len == 8) {
|
||||||
channel_layout = avio_rl64(bc);
|
// Ignored
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
av_log(s, AV_LOG_WARNING, "Unknown data %s / %s\n", name, type_str);
|
av_log(s, AV_LOG_WARNING, "Unknown data %s / %s\n", name, type_str);
|
||||||
@ -952,7 +950,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
|
|||||||
} else if (!strcmp(name, "SkipEnd")) {
|
} else if (!strcmp(name, "SkipEnd")) {
|
||||||
skip_end = value;
|
skip_end = value;
|
||||||
} else if (!strcmp(name, "Channels")) {
|
} else if (!strcmp(name, "Channels")) {
|
||||||
channels = value;
|
// Ignored
|
||||||
} else if (!strcmp(name, "SampleRate")) {
|
} else if (!strcmp(name, "SampleRate")) {
|
||||||
sample_rate = value;
|
sample_rate = value;
|
||||||
} else if (!strcmp(name, "Width")) {
|
} else if (!strcmp(name, "Width")) {
|
||||||
@ -965,18 +963,14 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (channels || channel_layout || sample_rate || width || height) {
|
if (sample_rate || width || height) {
|
||||||
uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 28);
|
uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 16);
|
||||||
if (!dst)
|
if (!dst)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
bytestream_put_le32(&dst,
|
bytestream_put_le32(&dst,
|
||||||
AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) +
|
AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) +
|
||||||
AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height))
|
AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height))
|
||||||
);
|
);
|
||||||
if (channels)
|
|
||||||
bytestream_put_le32(&dst, channels);
|
|
||||||
if (channel_layout)
|
|
||||||
bytestream_put_le64(&dst, channel_layout);
|
|
||||||
if (sample_rate)
|
if (sample_rate)
|
||||||
bytestream_put_le32(&dst, sample_rate);
|
bytestream_put_le32(&dst, sample_rate);
|
||||||
if (width || height){
|
if (width || height){
|
||||||
|
Loading…
Reference in New Issue
Block a user