From 12cc3bf29ae4c0bc843f48efaad1df3e88fce63a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 Oct 2013 21:18:48 +0200 Subject: avformat: rename a few more h.265 to HEVC Signed-off-by: Michael Niedermayer --- libavformat/Makefile | 2 +- libavformat/allformats.c | 2 +- libavformat/h265dec.c | 60 ------------------------------------------------ libavformat/hevcdec.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 libavformat/h265dec.c create mode 100644 libavformat/hevcdec.c (limited to 'libavformat') diff --git a/libavformat/Makefile b/libavformat/Makefile index 510701278e..9d4b6268ad 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o -OBJS-$(CONFIG_H265_DEMUXER) += h265dec.o rawdec.o +OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e9eafb4de7..0e1b262904 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -135,7 +135,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); - REGISTER_DEMUXER (H265, h265); + REGISTER_DEMUXER (HEVC, hevc); REGISTER_MUXDEMUX(HLS, hls); REGISTER_MUXDEMUX(ICO, ico); REGISTER_DEMUXER (IDCIN, idcin); diff --git a/libavformat/h265dec.c b/libavformat/h265dec.c deleted file mode 100644 index ee209f3473..0000000000 --- a/libavformat/h265dec.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * RAW H.265 video demuxer - * Copyright (c) 2013 Dirk Farin - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "avformat.h" -#include "rawdec.h" - -static int h265_probe(AVProbeData *p) -{ - uint32_t code= -1; - int vps=0, sps=0, pps=0, idr=0; - int i; - - for(i=0; ibuf_size-1; i++){ - code = (code<<8) + p->buf[i]; - if ((code & 0xffffff00) == 0x100) { - uint8_t nal2 = p->buf[i+1]; - int type = (code & 0x7E)>>1; - - if (code & 0x81) // forbidden and reserved zero bits - return 0; - - if (nal2 & 0xf8) // reserved zero - return 0; - - switch (type) { - case 32: vps++; break; - case 33: sps++; break; - case 34: pps++; break; - case 19: - case 20: idr++; break; - } - } - } - - // printf("vps=%d, sps=%d, pps=%d, idr=%d\n", vps, sps, pps, idr); - - if (vps && sps && pps && idr) - return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg - return 0; -} - -FF_DEF_RAWVIDEO_DEMUXER(h265 , "raw H.265 video", h265_probe, "h265,265,hevc", AV_CODEC_ID_HEVC) diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c new file mode 100644 index 0000000000..51e1504459 --- /dev/null +++ b/libavformat/hevcdec.c @@ -0,0 +1,60 @@ +/* + * RAW H.265 video demuxer + * Copyright (c) 2013 Dirk Farin + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "rawdec.h" + +static int hevc_probe(AVProbeData *p) +{ + uint32_t code= -1; + int vps=0, sps=0, pps=0, idr=0; + int i; + + for(i=0; ibuf_size-1; i++){ + code = (code<<8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + uint8_t nal2 = p->buf[i+1]; + int type = (code & 0x7E)>>1; + + if (code & 0x81) // forbidden and reserved zero bits + return 0; + + if (nal2 & 0xf8) // reserved zero + return 0; + + switch (type) { + case 32: vps++; break; + case 33: sps++; break; + case 34: pps++; break; + case 19: + case 20: idr++; break; + } + } + } + + // printf("vps=%d, sps=%d, pps=%d, idr=%d\n", vps, sps, pps, idr); + + if (vps && sps && pps && idr) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(hevc , "raw HEVC video", hevc_probe, "h265,265,hevc", AV_CODEC_ID_HEVC) -- cgit v1.2.3