Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/flvdec: move set bit_rate from parse AMF OBJECT to

Browse Source 
create_stream

before patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 25 fps, 25 tbr, 1k tbn, 50 tbc

after patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 2576 kb/s, 25 fps, 25 tbr, 1k tbn, 50 tbc

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
pull/241/head
Steven Liu 8 years ago
parent ee24c8ad01
commit 7c5478a203
1 changed files with 8 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavformat/flvdec.c

12
libavformat/flvdec.c
Unescape View File

@ -64,6 +64,8 @@ typedef struct FLVContext {
int last_keyframe_stream_index; int last_keyframe_stream_index;
int keyframe_count; int keyframe_count;
int64_t video_bit_rate;
int64_t audio_bit_rate;
int64_t *keyframe_times; int64_t *keyframe_times;
int64_t *keyframe_filepositions; int64_t *keyframe_filepositions;
int missing_streams; int missing_streams;
@ -142,8 +144,10 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type)
&& s->streams[1]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)) && s->streams[1]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE))
s->ctx_flags &= ~AVFMTCTX_NOHEADER; s->ctx_flags &= ~AVFMTCTX_NOHEADER;
if (codec_type == AVMEDIA_TYPE_AUDIO) if (codec_type == AVMEDIA_TYPE_AUDIO)
st->codecpar->bit_rate = flv->audio_bit_rate;
flv->missing_streams &= ~FLV_HEADER_FLAG_HASAUDIO; flv->missing_streams &= ~FLV_HEADER_FLAG_HASAUDIO;
if (codec_type == AVMEDIA_TYPE_VIDEO) { if (codec_type == AVMEDIA_TYPE_VIDEO) {
st->codecpar->bit_rate = flv->video_bit_rate;
flv->missing_streams &= ~FLV_HEADER_FLAG_HASVIDEO; flv->missing_streams &= ~FLV_HEADER_FLAG_HASVIDEO;
st->avg_frame_rate = flv->framerate; st->avg_frame_rate = flv->framerate;
} }
@ -547,12 +551,12 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
amf_type == AMF_DATA_TYPE_BOOL) { amf_type == AMF_DATA_TYPE_BOOL) {
if (!strcmp(key, "duration")) if (!strcmp(key, "duration"))
s->duration = num_val * AV_TIME_BASE; s->duration = num_val * AV_TIME_BASE;
else if (!strcmp(key, "videodatarate") && vpar && else if (!strcmp(key, "videodatarate") &&
0 <= (int)(num_val * 1024.0)) 0 <= (int)(num_val * 1024.0))
vpar->bit_rate = num_val * 1024.0; flv->video_bit_rate = num_val * 1024.0;
else if (!strcmp(key, "audiodatarate") && apar && else if (!strcmp(key, "audiodatarate") &&
0 <= (int)(num_val * 1024.0)) 0 <= (int)(num_val * 1024.0))
apar->bit_rate = num_val * 1024.0; flv->audio_bit_rate = num_val * 1024.0;
else if (!strcmp(key, "datastream")) { else if (!strcmp(key, "datastream")) {
AVStream *st = create_stream(s, AVMEDIA_TYPE_SUBTITLE); AVStream *st = create_stream(s, AVMEDIA_TYPE_SUBTITLE);
if (!st) if (!st)

Write Preview
Loading…
Cancel
Save