highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dss: Set values known during read_header in read_header

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-04-01 22:31:13 +02:00
parent 5d06d26be3
commit ef8c8b4163
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/dss.c
View File

@ -144,6 +144,8 @@ static int dss_read_header(AVFormatContext *s)
if (ctx->audio_codec == DSS_ACODEC_DSS_SP) { if (ctx->audio_codec == DSS_ACODEC_DSS_SP) {
st->codecpar->codec_id = AV_CODEC_ID_DSS_SP; st->codecpar->codec_id = AV_CODEC_ID_DSS_SP;
st->codecpar->sample_rate = 11025; st->codecpar->sample_rate = 11025;
s->bit_rate = 8 * (DSS_FRAME_SIZE - 1) * st->codecpar->sample_rate
* 512 / (506 * 264);
} else if (ctx->audio_codec == DSS_ACODEC_G723_1) { } else if (ctx->audio_codec == DSS_ACODEC_G723_1) {
st->codecpar->codec_id = AV_CODEC_ID_G723_1; st->codecpar->codec_id = AV_CODEC_ID_G723_1;
st->codecpar->sample_rate = 8000; st->codecpar->sample_rate = 8000;
@ -206,7 +208,6 @@ static void dss_sp_byte_swap(DSSDemuxContext *ctx,
static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
DSSDemuxContext *ctx = s->priv_data; DSSDemuxContext *ctx = s->priv_data;
AVStream *st = s->streams[0];
int read_size, ret, offset = 0, buff_offset = 0; int read_size, ret, offset = 0, buff_offset = 0;
int64_t pos = avio_tell(s->pb); int64_t pos = avio_tell(s->pb);
@ -219,8 +220,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt)
} else } else
read_size = DSS_FRAME_SIZE; read_size = DSS_FRAME_SIZE;
ctx->packet_size = DSS_FRAME_SIZE - 1;
ret = av_new_packet(pkt, DSS_FRAME_SIZE); ret = av_new_packet(pkt, DSS_FRAME_SIZE);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -228,7 +227,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->duration = 264; pkt->duration = 264;
pkt->pos = pos; pkt->pos = pos;
pkt->stream_index = 0; pkt->stream_index = 0;
s->bit_rate = 8LL * ctx->packet_size * st->codecpar->sample_rate * 512 / (506 * pkt->duration);
if (ctx->counter < read_size) { if (ctx->counter < read_size) {
ret = avio_read(s->pb, ctx->dss_sp_buf + buff_offset, ret = avio_read(s->pb, ctx->dss_sp_buf + buff_offset,