Browse Source

avcodec/hapqa_extract_bsf : add new bsf filter

convert HapQA data to HAPQ or HAPAlphaOnly
by copying the corresponding texture
tags/n4.0
Martin Vignali 7 years ago
parent
commit
7b0cb2e032
5 changed files with 163 additions and 0 deletions
  1. +1
    -0
      Changelog
  2. +25
    -0
      doc/bitstream_filters.texi
  3. +1
    -0
      libavcodec/Makefile
  4. +1
    -0
      libavcodec/bitstream_filters.c
  5. +135
    -0
      libavcodec/hapqa_extract_bsf.c

+ 1
- 0
Changelog View File

@@ -46,6 +46,7 @@ version <next>:
They can be found at http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
- native SBC encoder and decoder
- drmeter audio filter
- hapqa_extract bitstream filter


version 3.4:


+ 25
- 0
doc/bitstream_filters.texi View File

@@ -93,6 +93,31 @@ When this option is enabled, the long-term headers are removed from the
bitstream after extraction.
@end table

@section hapqa_extract

Extract Rgb or Alpha part of an HAPQA file, without recompression, in order to create an HAPQ or an HAPAlphaOnly file.

@table @option
@item texture
Specifies the texture to keep.

@table @option
@item color
@item alpha
@end table

@end table

Convert HAPQA to HAPQ
@example
ffmpeg -i hapqa_inputfile.mov -c copy -bsf:v hapqa_extract=texture=color -tag:v HapY -metadata:s:v:0 encoder="HAPQ" hapq_file.mov
@end example

Convert HAPQA to HAPAlphaOnly
@example
ffmpeg -i hapqa_inputfile.mov -c copy -bsf:v hapqa_extract=texture=alpha -tag:v HapA -metadata:s:v:0 encoder="HAPAlpha Only" hapalphaonly_file.mov
@end example

@section h264_metadata

Modify metadata embedded in an H.264 stream.


+ 1
- 0
libavcodec/Makefile View File

@@ -1043,6 +1043,7 @@ OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += extract_extradata_bsf.o \
OBJS-$(CONFIG_H264_METADATA_BSF) += h264_metadata_bsf.o
OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o
OBJS-$(CONFIG_H264_REDUNDANT_PPS_BSF) += h264_redundant_pps_bsf.o
OBJS-$(CONFIG_HAPQA_EXTRACT_BSF) += hapqa_extract_bsf.o hap.o
OBJS-$(CONFIG_HEVC_METADATA_BSF) += h265_metadata_bsf.o
OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF) += hevc_mp4toannexb_bsf.o
OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o


+ 1
- 0
libavcodec/bitstream_filters.c View File

@@ -32,6 +32,7 @@ extern const AVBitStreamFilter ff_extract_extradata_bsf;
extern const AVBitStreamFilter ff_h264_metadata_bsf;
extern const AVBitStreamFilter ff_h264_mp4toannexb_bsf;
extern const AVBitStreamFilter ff_h264_redundant_pps_bsf;
extern const AVBitStreamFilter ff_hapqa_extract_bsf;
extern const AVBitStreamFilter ff_hevc_metadata_bsf;
extern const AVBitStreamFilter ff_hevc_mp4toannexb_bsf;
extern const AVBitStreamFilter ff_imx_dump_header_bsf;


+ 135
- 0
libavcodec/hapqa_extract_bsf.c View File

@@ -0,0 +1,135 @@
/*
* HAPQA extract bitstream filter
* Copyright (c) 2017 Jokyo Images
*
* 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
*/

/**
* @file
* HAPQA extract bitstream filter
* extract one of the two textures of the HAQA
*/

#include "avcodec.h"
#include "bsf.h"
#include "bytestream.h"
#include "hap.h"

typedef struct HapqaExtractContext {
const AVClass *class;
int texture;/* index of the texture to keep (0 for rgb or 1 for alpha) */
} HapqaExtractContext;

static int check_texture(HapqaExtractContext *ctx, int section_type) {
if (((ctx->texture == 0)&&((section_type & 0x0F) == 0x0F)) || /* HapQ texture and rgb extract */
((ctx->texture == 1)&&((section_type & 0x0F) == 0x01))) /* HapAlphaOnly texture and alpha extract */
{
return 1; /* the texture is the one to keep */
} else {
return 0;
}
}

static int hapqa_extract(AVBSFContext *bsf, AVPacket *out)
{
HapqaExtractContext *ctx = bsf->priv_data;
GetByteContext gbc;
int section_size;
enum HapSectionType section_type;
int start_section_size;
int target_packet_size = 0;
AVPacket *in;
int ret = 0;

ret = ff_bsf_get_packet(bsf, &in);
if (ret < 0)
return ret;

bytestream2_init(&gbc, in->data, in->size);
ret = ff_hap_parse_section_header(&gbc, &section_size, &section_type);
if (ret != 0)
goto fail;

if ((section_type & 0x0F) != 0x0D) {
av_log(bsf, AV_LOG_ERROR, "Invalid section type for HAPQA %#04x.\n", section_type & 0x0F);
goto fail;
}

start_section_size = 4;

bytestream2_seek(&gbc, start_section_size, SEEK_SET);/* go to start of the first texture */

ret = ff_hap_parse_section_header(&gbc, &section_size, &section_type);
if (ret != 0)
goto fail;

target_packet_size = section_size + 4;

if (check_texture(ctx, section_type) == 0) { /* the texture is not the one to keep */
start_section_size += 4 + section_size;
bytestream2_seek(&gbc, start_section_size, SEEK_SET);/* go to start of the second texture */
ret = ff_hap_parse_section_header(&gbc, &section_size, &section_type);
if (ret != 0)
goto fail;

target_packet_size = section_size + 4;

if (check_texture(ctx, section_type) == 0){ /* the second texture is not the one to keep */
av_log(bsf, AV_LOG_ERROR, "No valid texture found.\n");
goto fail;
}
}

av_packet_move_ref(out, in);
out->data += start_section_size;
out->size = target_packet_size;

fail:
if (ret < 0)
av_packet_unref(out);
av_packet_free(&in);
return ret;
}

static const enum AVCodecID codec_ids[] = {
AV_CODEC_ID_HAP, AV_CODEC_ID_NONE,
};

#define OFFSET(x) offsetof(HapqaExtractContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
{ "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS, "texture" },
{ "color", "keep HapQ texture", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "texture" },
{ "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "texture" },
{ NULL },
};

static const AVClass hapqa_extract_class = {
.class_name = "hapqa_extract_bsf",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_MAJOR,
};

const AVBitStreamFilter ff_hapqa_extract_bsf = {
.name = "hapqa_extract",
.filter = hapqa_extract,
.priv_data_size = sizeof(HapqaExtractContext),
.priv_class = &hapqa_extract_class,
.codec_ids = codec_ids,
};

Loading…
Cancel
Save