/*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * 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.
*
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "hevc.h"
-static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, BitstreamContext *bc,
+static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc,
const char *name, uint32_t *write_to,
uint32_t range_min, uint32_t range_max)
{
unsigned int k;
char bits[65];
- position = bitstream_tell(bc);
+ position = get_bits_count(gbc);
for (i = 0; i < 32; i++) {
- if (bitstream_bits_left(bc) < i + 1) {
+ if (get_bits_left(gbc) < i + 1) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid ue-golomb code at "
"%s: bitstream ended.\n", name);
return AVERROR_INVALIDDATA;
}
- k = bitstream_read_bit(bc);
+ k = get_bits1(gbc);
bits[i] = k ? '1' : '0';
if (k)
break;
}
value = 1;
for (j = 0; j < i; j++) {
- k = bitstream_read_bit(bc);
+ k = get_bits1(gbc);
bits[i + j + 1] = k ? '1' : '0';
value = value << 1 | k;
}
return 0;
}
-static int cbs_read_se_golomb(CodedBitstreamContext *ctx, BitstreamContext *bc,
+static int cbs_read_se_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc,
const char *name, int32_t *write_to,
int32_t range_min, int32_t range_max)
{
uint32_t v;
char bits[65];
- position = bitstream_tell(bc);
+ position = get_bits_count(gbc);
for (i = 0; i < 32; i++) {
- if (bitstream_bits_left(bc) < i + 1) {
+ if (get_bits_left(gbc) < i + 1) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid se-golomb code at "
"%s: bitstream ended.\n", name);
return AVERROR_INVALIDDATA;
}
- k = bitstream_read_bit(bc);
+ k = get_bits1(gbc);
bits[i] = k ? '1' : '0';
if (k)
break;
}
v = 1;
for (j = 0; j < i; j++) {
- k = bitstream_read_bit(bc);
+ k = get_bits1(gbc);
bits[i + j + 1] = k ? '1' : '0';
v = v << 1 | k;
}
#define READ
#define READWRITE read
-#define RWContext BitstreamContext
+#define RWContext GetBitContext
#define xu(width, name, var, range_min, range_max) do { \
uint32_t value = range_min; \
current->name = value; \
} while (0)
-static int cbs_h2645_read_more_rbsp_data(BitstreamContext *bc)
+static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc)
{
- int bits_left = bitstream_bits_left(bc);
+ int bits_left = get_bits_left(gbc);
if (bits_left > 8)
return 1;
- if (bitstream_peek(bc, bits_left) == 1 << (bits_left - 1))
+ if (show_bits(gbc, bits_left) == 1 << (bits_left - 1))
return 0;
return 1;
}
#define more_rbsp_data(var) ((var) = cbs_h2645_read_more_rbsp_data(rw))
-#define byte_alignment(rw) (bitstream_tell(rw) % 8)
+#define byte_alignment(rw) (get_bits_count(rw) % 8)
#define allocate(name, size) do { \
name ## _ref = av_buffer_allocz(size); \
memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type,
- data, nal->size, NULL);
+ data, size, NULL);
if (err < 0) {
av_freep(&data);
return err;
err = ff_h2645_packet_split(&priv->read_packet,
frag->data + start, end - start,
- ctx->log_ctx, 1, 2, AV_CODEC_ID_H264);
+ ctx->log_ctx, 1, 2, AV_CODEC_ID_H264, 1);
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to split AVCC SPS array.\n");
return err;
err = ff_h2645_packet_split(&priv->read_packet,
frag->data + start, end - start,
- ctx->log_ctx, 1, 2, AV_CODEC_ID_H264);
+ ctx->log_ctx, 1, 2, AV_CODEC_ID_H264, 1);
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to split AVCC PPS array.\n");
return err;
err = ff_h2645_packet_split(&priv->read_packet,
frag->data + start, end - start,
- ctx->log_ctx, 1, 2, AV_CODEC_ID_HEVC);
+ ctx->log_ctx, 1, 2, AV_CODEC_ID_HEVC, 1);
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to split "
"HVCC array %d (%d NAL units of type %d).\n",
frag->data, frag->data_size,
ctx->log_ctx,
priv->mp4, priv->nal_length_size,
- codec_id);
+ codec_id, 1);
if (err < 0)
return err;
static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit)
{
- BitstreamContext bc;
+ GetBitContext gbc;
int err;
- err = bitstream_init(&bc, unit->data, 8 * unit->data_size);
+ err = init_get_bits(&gbc, unit->data, 8 * unit->data_size);
if (err < 0)
return err;
return err;
sps = unit->content;
- err = cbs_h264_read_sps(ctx, &bc, sps);
+ err = cbs_h264_read_sps(ctx, &gbc, sps);
if (err < 0)
return err;
if (err < 0)
return err;
- err = cbs_h264_read_sps_extension(ctx, &bc, unit->content);
+ err = cbs_h264_read_sps_extension(ctx, &gbc, unit->content);
if (err < 0)
return err;
}
return err;
pps = unit->content;
- err = cbs_h264_read_pps(ctx, &bc, pps);
+ err = cbs_h264_read_pps(ctx, &gbc, pps);
if (err < 0)
return err;
return err;
slice = unit->content;
- err = cbs_h264_read_slice_header(ctx, &bc, &slice->header);
+ err = cbs_h264_read_slice_header(ctx, &gbc, &slice->header);
if (err < 0)
return err;
- pos = bitstream_tell(&bc);
+ pos = get_bits_count(&gbc);
len = unit->data_size;
if (!unit->data[len - 1]) {
int z;
if (err < 0)
return err;
- err = cbs_h264_read_aud(ctx, &bc, unit->content);
+ err = cbs_h264_read_aud(ctx, &gbc, unit->content);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h264_read_sei(ctx, &bc, unit->content);
+ err = cbs_h264_read_sei(ctx, &gbc, unit->content);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h264_read_filler(ctx, &bc, unit->content);
+ err = cbs_h264_read_filler(ctx, &gbc, unit->content);
if (err < 0)
return err;
}
static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit)
{
- BitstreamContext bc;
+ GetBitContext gbc;
int err;
- err = bitstream_init(&bc, unit->data, 8 * unit->data_size);
+ err = init_get_bits(&gbc, unit->data, 8 * unit->data_size);
if (err < 0)
return err;
return err;
vps = unit->content;
- err = cbs_h265_read_vps(ctx, &bc, vps);
+ err = cbs_h265_read_vps(ctx, &gbc, vps);
if (err < 0)
return err;
return err;
sps = unit->content;
- err = cbs_h265_read_sps(ctx, &bc, sps);
+ err = cbs_h265_read_sps(ctx, &gbc, sps);
if (err < 0)
return err;
return err;
pps = unit->content;
- err = cbs_h265_read_pps(ctx, &bc, pps);
+ err = cbs_h265_read_pps(ctx, &gbc, pps);
if (err < 0)
return err;
return err;
slice = unit->content;
- err = cbs_h265_read_slice_segment_header(ctx, &bc, &slice->header);
+ err = cbs_h265_read_slice_segment_header(ctx, &gbc, &slice->header);
if (err < 0)
return err;
- pos = bitstream_tell(&bc);
+ pos = get_bits_count(&gbc);
len = unit->data_size;
if (!unit->data[len - 1]) {
int z;
if (err < 0)
return err;
- err = cbs_h265_read_aud(ctx, &bc, unit->content);
+ err = cbs_h265_read_aud(ctx, &gbc, unit->content);
if (err < 0)
return err;
}
case H264_NAL_AUXILIARY_SLICE:
{
H264RawSlice *slice = unit->content;
- BitstreamContext bc;
+ GetBitContext gbc;
int bits_left, end, zeroes;
err = cbs_h264_write_slice_header(ctx, pbc, &slice->header);
if (slice->data_size * 8 + 8 > put_bits_left(pbc))
return AVERROR(ENOSPC);
- bitstream_init(&bc, slice->data, slice->data_size * 8);
- bitstream_skip(&bc, slice->data_bit_start);
+ init_get_bits(&gbc, slice->data, slice->data_size * 8);
+ skip_bits_long(&gbc, slice->data_bit_start);
// Copy in two-byte blocks, but stop before copying the
// rbsp_stop_one_bit in the final byte.
- while (bitstream_bits_left(&bc) > 23)
- put_bits(pbc, 16, bitstream_read(&bc, 16));
+ while (get_bits_left(&gbc) > 23)
+ put_bits(pbc, 16, get_bits(&gbc, 16));
- bits_left = bitstream_bits_left(&bc);
- end = bitstream_read(&bc, bits_left);
+ bits_left = get_bits_left(&gbc);
+ end = get_bits(&gbc, bits_left);
// rbsp_stop_one_bit must be present here.
av_assert0(end);
case HEVC_NAL_CRA_NUT:
{
H265RawSlice *slice = unit->content;
- BitstreamContext bc;
+ GetBitContext gbc;
int bits_left, end, zeroes;
err = cbs_h265_write_slice_segment_header(ctx, pbc, &slice->header);
if (slice->data_size * 8 + 8 > put_bits_left(pbc))
return AVERROR(ENOSPC);
- bitstream_init(&bc, slice->data, slice->data_size * 8);
- bitstream_skip(&bc, slice->data_bit_start);
+ init_get_bits(&gbc, slice->data, slice->data_size * 8);
+ skip_bits_long(&gbc, slice->data_bit_start);
// Copy in two-byte blocks, but stop before copying the
// rbsp_stop_one_bit in the final byte.
- while (bitstream_bits_left(&bc) > 23)
- put_bits(pbc, 16, bitstream_read(&bc, 16));
+ while (get_bits_left(&gbc) > 23)
+ put_bits(pbc, 16, get_bits(&gbc, 16));
- bits_left = bitstream_bits_left(&bc);
- end = bitstream_read(&bc, bits_left);
+ bits_left = get_bits_left(&gbc);
+ end = get_bits(&gbc, bits_left);
// rbsp_stop_one_bit must be present here.
av_assert0(end);
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}
projects / ffmpeg / blobdiff