RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'

Browse Source 
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-26 14:04:39 +02:00
commit cf0e8e7ad4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mpeg.h
View File

@ -40,6 +40,7 @@
#define AUDIO_ID 0xc0
#define VIDEO_ID 0xe0
#define H264_ID 0xe2
#define AC3_ID 0x80
#define DTS_ID 0x88
#define LPCM_ID 0xa0

13
libavformat/mpegenc.c
View File

@ -301,7 +301,7 @@ static int get_system_header_size(AVFormatContext *ctx)
static av_cold int mpeg_mux_init(AVFormatContext *ctx)
{
MpegMuxContext *s = ctx->priv_data;
int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j;
int bitrate, i, mpa_id, mpv_id, h264_id, mps_id, ac3_id, dts_id, lpcm_id, j;
AVStream *st;
StreamInfo *stream;
int audio_bitrate;
@ -337,6 +337,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
ac3_id = AC3_ID;
dts_id = DTS_ID;
mpv_id = VIDEO_ID;
h264_id = H264_ID;
mps_id = SUB_ID;
lpcm_id = LPCM_ID;
@ -388,7 +389,10 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
s->audio_bound++;
break;
case AVMEDIA_TYPE_VIDEO:
stream->id = mpv_id++;
if (st->codec->codec_id == AV_CODEC_ID_H264)
stream->id = h264_id++;
else
stream->id = mpv_id++;
if (st->codec->rc_buffer_size)
stream->max_buffer_size = 6 * 1024 + st->codec->rc_buffer_size / 8;
else {
@ -424,7 +428,8 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
st = ctx->streams[i];
stream = (StreamInfo *)st->priv_data;
if (st->codec->rc_max_rate || stream->id == VIDEO_ID)
if (st->codec->rc_max_rate ||
st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
codec_rate = st->codec->rc_max_rate;
else
codec_rate = st->codec->bit_rate;
@ -436,7 +441,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
if ((stream->id & 0xe0) == AUDIO_ID)
audio_bitrate += codec_rate;
else if (stream->id == VIDEO_ID)
else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
video_bitrate += codec_rate;
}