RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/rawenc: add automatic bitstream filtering for H264+HEVC

This commit is contained in:
Rodger Combs 2016-09-09 23:27:54 -05:00
parent 42cb050a05
commit d99d7cbdfc
No known key found for this signature in database
GPG Key ID: E3E54DCDCD3CB843
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/rawenc.c
View File

@ -20,8 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "rawenc.h"
#include "internal.h"
int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
{
@ -236,6 +239,15 @@ AVOutputFormat ff_h263_muxer = {
#endif
#if CONFIG_H264_MUXER
static int h264_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
{
AVStream *st = s->streams[0];
if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
AV_RB24(pkt->data) != 0x000001)
return ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL);
return 1;
}
AVOutputFormat ff_h264_muxer = {
.name = "h264",
.long_name = NULL_IF_CONFIG_SMALL("raw H.264 video"),
@ -244,11 +256,21 @@ AVOutputFormat ff_h264_muxer = {
.video_codec = AV_CODEC_ID_H264,
.write_header = force_one_stream,
.write_packet = ff_raw_write_packet,
.check_bitstream = h264_check_bitstream,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
#if CONFIG_HEVC_MUXER
static int hevc_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
{
AVStream *st = s->streams[0];
if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
AV_RB24(pkt->data) != 0x000001)
return ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL);
return 1;
}
AVOutputFormat ff_hevc_muxer = {
.name = "hevc",
.long_name = NULL_IF_CONFIG_SMALL("raw HEVC video"),
@ -257,6 +279,7 @@ AVOutputFormat ff_hevc_muxer = {
.video_codec = AV_CODEC_ID_HEVC,
.write_header = force_one_stream,
.write_packet = ff_raw_write_packet,
.check_bitstream = hevc_check_bitstream,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif