lavf/avs3dec: add raw avs3 demuxer

Signed-off-by: hbj <hanbj@pku.edu.cn>
Signed-off-by: hwren <hwrenx@126.com>
This commit is contained in:
hwren 2020-10-05 20:10:45 +08:00
parent 6223d77578
commit ff74ad2a4b
5 changed files with 72 additions and 1 deletions

View File

@ -32,6 +32,7 @@ version <next>:
- Argonaut Games Video decoder
- libwavpack encoder removed
- ACE demuxer
- AVS3 demuxer
version 4.3:

View File

@ -125,6 +125,7 @@ OBJS-$(CONFIG_AVR_DEMUXER) += avr.o pcm.o
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o vocdec.o voc.o
OBJS-$(CONFIG_AVS2_DEMUXER) += davs2.o rawdec.o
OBJS-$(CONFIG_AVS2_MUXER) += rawenc.o
OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
OBJS-$(CONFIG_BINK_DEMUXER) += bink.o

View File

@ -87,6 +87,7 @@ extern AVInputFormat ff_avr_demuxer;
extern AVInputFormat ff_avs_demuxer;
extern AVInputFormat ff_avs2_demuxer;
extern AVOutputFormat ff_avs2_muxer;
extern AVInputFormat ff_avs3_demuxer;
extern AVInputFormat ff_bethsoftvid_demuxer;
extern AVInputFormat ff_bfi_demuxer;
extern AVInputFormat ff_bintext_demuxer;

68
libavformat/avs3dec.c Normal file
View File

@ -0,0 +1,68 @@
/*
* RAW AVS3-P2/IEEE1857.10 video demuxer
* Copyright (c) 2020 Zhenyu Wang <wangzhenyu@pkusz.edu.cn>
* Bingjie Han <hanbj@pkusz.edu.cn>
* Huiwen Ren <hwrenx@gmail.com>
*
* 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 "libavcodec/avs3.h"
#include "libavcodec/internal.h"
#include "avformat.h"
#include "rawdec.h"
static int avs3video_probe(const AVProbeData *p)
{
const uint8_t *ptr = p->buf, *end = p->buf + p->buf_size;
uint32_t code = -1;
uint8_t state = 0;
int pic = 0, seq = 0, slice_pos = 0;
int ret = 0;
while (ptr < end) {
ptr = avpriv_find_start_code(ptr, end, &code);
state = code & 0xFF;
if ((code & 0xFFFFFF00) == 0x100) {
if (state < AVS3_SEQ_START_CODE) {
if (code < slice_pos)
return 0;
slice_pos = code;
} else {
slice_pos = 0;
}
if (state == AVS3_SEQ_START_CODE) {
seq++;
if (*ptr != AVS3_PROFILE_BASELINE_MAIN && *ptr != AVS3_PROFILE_BASELINE_MAIN10)
return 0;
} else if (AVS3_ISPIC(state)) {
pic++;
} else if ((state == AVS3_UNDEF_START_CODE) ||
(state > AVS3_VIDEO_EDIT_CODE)) {
return 0;
}
}
}
if (seq && pic && av_match_ext(p->filename, "avs3")) {
ret = AVPROBE_SCORE_MAX;
}
return ret;
}
FF_DEF_RAWVIDEO_DEMUXER(avs3, "raw AVS3-P2/IEEE1857.10", avs3video_probe, "avs3", AV_CODEC_ID_AVS3)

View File

@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 60
#define LIBAVFORMAT_VERSION_MINOR 61
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \