* [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads
@ 2022-06-22 1:42 Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 2/3] avcodec/hcadec: Move transient GetBitContext to stack Andreas Rheinhardt
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2022-06-22 1:42 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/hcadec.c | 80 ++++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 41 deletions(-)
diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c
index 4e84942bb9..73ff62139d 100644
--- a/libavcodec/hcadec.c
+++ b/libavcodec/hcadec.c
@@ -23,6 +23,7 @@
#include "libavutil/tx.h"
#include "avcodec.h"
+#include "bytestream.h"
#include "codec_internal.h"
#include "get_bits.h"
#include "internal.h"
@@ -106,7 +107,7 @@ static inline unsigned ceil2(unsigned a, unsigned b)
static av_cold int decode_init(AVCodecContext *avctx)
{
HCAContext *c = avctx->priv_data;
- GetBitContext *gb = &c->gb;
+ GetByteContext gb0, *const gb = &gb0;
int8_t r[16] = { 0 };
float scale = 1.f / 8.f;
unsigned b, chunk;
@@ -118,41 +119,42 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 16)
return AVERROR(EINVAL);
- ret = init_get_bits8(gb, avctx->extradata, avctx->extradata_size);
- if (ret < 0)
- return ret;
- skip_bits_long(gb, 32);
- version = get_bits(gb, 16);
- skip_bits_long(gb, 16);
+ if (avctx->extradata_size < 36)
+ return AVERROR_INVALIDDATA;
+ bytestream2_init(gb, avctx->extradata, avctx->extradata_size);
+
+ bytestream2_skipu(gb, 4);
+ version = bytestream2_get_be16(gb);
+ bytestream2_skipu(gb, 2);
c->ath_type = version >= 0x200 ? 0 : 1;
- if (get_bits_long(gb, 32) != MKBETAG('f', 'm', 't', 0))
+ if (bytestream2_get_be32u(gb) != MKBETAG('f', 'm', 't', 0))
return AVERROR_INVALIDDATA;
- skip_bits_long(gb, 32);
- skip_bits_long(gb, 32);
- skip_bits_long(gb, 32);
+ bytestream2_skipu(gb, 4);
+ bytestream2_skipu(gb, 4);
+ bytestream2_skipu(gb, 4);
- chunk = get_bits_long(gb, 32);
+ chunk = bytestream2_get_be32u(gb);
if (chunk == MKBETAG('c', 'o', 'm', 'p')) {
- skip_bits_long(gb, 16);
- skip_bits_long(gb, 8);
- skip_bits_long(gb, 8);
- c->track_count = get_bits(gb, 8);
- c->channel_config = get_bits(gb, 8);
- c->total_band_count = get_bits(gb, 8);
- c->base_band_count = get_bits(gb, 8);
- c->stereo_band_count = get_bits(gb, 8);
- c->bands_per_hfr_group = get_bits(gb, 8);
+ bytestream2_skipu(gb, 2);
+ bytestream2_skipu(gb, 1);
+ bytestream2_skipu(gb, 1);
+ c->track_count = bytestream2_get_byteu(gb);
+ c->channel_config = bytestream2_get_byteu(gb);
+ c->total_band_count = bytestream2_get_byteu(gb);
+ c->base_band_count = bytestream2_get_byteu(gb);
+ c->stereo_band_count = bytestream2_get_byte (gb);
+ c->bands_per_hfr_group = bytestream2_get_byte (gb);
} else if (chunk == MKBETAG('d', 'e', 'c', 0)) {
- skip_bits_long(gb, 16);
- skip_bits_long(gb, 8);
- skip_bits_long(gb, 8);
- c->total_band_count = get_bits(gb, 8) + 1;
- c->base_band_count = get_bits(gb, 8) + 1;
- c->track_count = get_bits(gb, 4);
- c->channel_config = get_bits(gb, 4);
- if (!get_bits(gb, 8))
+ bytestream2_skipu(gb, 2);
+ bytestream2_skipu(gb, 1);
+ bytestream2_skipu(gb, 1);
+ c->total_band_count = bytestream2_get_byteu(gb) + 1;
+ c->base_band_count = bytestream2_get_byteu(gb) + 1;
+ c->track_count = bytestream2_peek_byteu(gb) >> 4;
+ c->channel_config = bytestream2_get_byteu(gb) & 0xF;
+ if (!bytestream2_get_byteu(gb))
c->base_band_count = c->total_band_count;
c->stereo_band_count = c->total_band_count - c->base_band_count;
c->bands_per_hfr_group = 0;
@@ -163,24 +165,20 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
- while (get_bits_left(gb) >= 32) {
- chunk = get_bits_long(gb, 32);
+ while (bytestream2_get_bytes_left(gb) >= 4) {
+ chunk = bytestream2_get_be32u(gb);
if (chunk == MKBETAG('v', 'b', 'r', 0)) {
- skip_bits_long(gb, 16);
- skip_bits_long(gb, 16);
+ bytestream2_skip(gb, 2 + 2);
} else if (chunk == MKBETAG('a', 't', 'h', 0)) {
- c->ath_type = get_bits(gb, 16);
+ c->ath_type = bytestream2_get_be16(gb);
} else if (chunk == MKBETAG('r', 'v', 'a', 0)) {
- skip_bits_long(gb, 32);
+ bytestream2_skip(gb, 4);
} else if (chunk == MKBETAG('c', 'o', 'm', 'm')) {
- skip_bits_long(gb, get_bits(gb, 8) * 8);
+ bytestream2_skip(gb, bytestream2_get_byte(gb) * 8);
} else if (chunk == MKBETAG('c', 'i', 'p', 'h')) {
- skip_bits_long(gb, 16);
+ bytestream2_skip(gb, 2);
} else if (chunk == MKBETAG('l', 'o', 'o', 'p')) {
- skip_bits_long(gb, 32);
- skip_bits_long(gb, 32);
- skip_bits_long(gb, 16);
- skip_bits_long(gb, 16);
+ bytestream2_skip(gb, 4 + 4 + 2 + 2);
} else if (chunk == MKBETAG('p', 'a', 'd', 0)) {
break;
} else {
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* [FFmpeg-devel] [PATCH 2/3] avcodec/hcadec: Move transient GetBitContext to stack
2022-06-22 1:42 [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
@ 2022-06-22 1:43 ` Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Don't use show_bits_long() unnecessarily Andreas Rheinhardt
2022-06-24 9:50 ` [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2022-06-22 1:43 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This avoids keeping pointers to no longer valid data
in the context.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/hcadec.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c
index 73ff62139d..7054575872 100644
--- a/libavcodec/hcadec.c
+++ b/libavcodec/hcadec.c
@@ -43,8 +43,6 @@ typedef struct ChannelContext {
} ChannelContext;
typedef struct HCAContext {
- GetBitContext gb;
-
const AVCRC *crc_table;
ChannelContext ch[16];
@@ -299,10 +297,9 @@ static void reconstruct_hfr(HCAContext *s, ChannelContext *ch,
ch->imdct_in[127] = 0;
}
-static void dequantize_coefficients(HCAContext *c, ChannelContext *ch)
+static void dequantize_coefficients(HCAContext *c, ChannelContext *ch,
+ GetBitContext *gb)
{
- GetBitContext *gb = &c->gb;
-
for (int i = 0; i < ch->count; i++) {
unsigned scale = ch->scale[i];
int nb_bits = max_bits_table[scale];
@@ -326,11 +323,11 @@ static void dequantize_coefficients(HCAContext *c, ChannelContext *ch)
}
static void unpack(HCAContext *c, ChannelContext *ch,
+ GetBitContext *gb,
unsigned hfr_group_count,
int packed_noise_level,
const uint8_t *ath)
{
- GetBitContext *gb = &c->gb;
int delta_bits = get_bits(gb, 3);
if (delta_bits > 5) {
@@ -390,7 +387,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
{
HCAContext *c = avctx->priv_data;
int ch, ret, packed_noise_level;
- GetBitContext *gb = &c->gb;
+ GetBitContext gb0, *const gb = &gb0;
float **samples;
if (avctx->err_recognition & AV_EF_CRCCHECK) {
@@ -412,11 +409,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
packed_noise_level = (get_bits(gb, 9) << 8) - get_bits(gb, 7);
for (ch = 0; ch < avctx->ch_layout.nb_channels; ch++)
- unpack(c, &c->ch[ch], c->hfr_group_count, packed_noise_level, c->ath);
+ unpack(c, &c->ch[ch], gb, c->hfr_group_count, packed_noise_level, c->ath);
for (int i = 0; i < 8; i++) {
for (ch = 0; ch < avctx->ch_layout.nb_channels; ch++)
- dequantize_coefficients(c, &c->ch[ch]);
+ dequantize_coefficients(c, &c->ch[ch], gb);
for (ch = 0; ch < avctx->ch_layout.nb_channels; ch++)
reconstruct_hfr(c, &c->ch[ch], c->hfr_group_count, c->bands_per_hfr_group,
c->stereo_band_count + c->base_band_count, c->total_band_count);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Don't use show_bits_long() unnecessarily
2022-06-22 1:42 [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 2/3] avcodec/hcadec: Move transient GetBitContext to stack Andreas Rheinhardt
@ 2022-06-22 1:43 ` Andreas Rheinhardt
2022-06-24 9:50 ` [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2022-06-22 1:43 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/hevc_ps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 764c4849ee..a955f585d9 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -659,7 +659,7 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx,
// Backup context in case an alternate header is detected
memcpy(&backup, gb, sizeof(backup));
memcpy(&backup_vui, vui, sizeof(backup_vui));
- if (get_bits_left(gb) >= 68 && show_bits_long(gb, 21) == 0x100000) {
+ if (get_bits_left(gb) >= 68 && show_bits(gb, 21) == 0x100000) {
vui->default_display_window_flag = 0;
av_log(avctx, AV_LOG_WARNING, "Invalid default display window\n");
} else
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads
2022-06-22 1:42 [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 2/3] avcodec/hcadec: Move transient GetBitContext to stack Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Don't use show_bits_long() unnecessarily Andreas Rheinhardt
@ 2022-06-24 9:50 ` Andreas Rheinhardt
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2022-06-24 9:50 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/hcadec.c | 80 ++++++++++++++++++++++-----------------------
> 1 file changed, 39 insertions(+), 41 deletions(-)
>
> diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c
> index 4e84942bb9..73ff62139d 100644
> --- a/libavcodec/hcadec.c
> +++ b/libavcodec/hcadec.c
> @@ -23,6 +23,7 @@
> #include "libavutil/tx.h"
>
> #include "avcodec.h"
> +#include "bytestream.h"
> #include "codec_internal.h"
> #include "get_bits.h"
> #include "internal.h"
> @@ -106,7 +107,7 @@ static inline unsigned ceil2(unsigned a, unsigned b)
> static av_cold int decode_init(AVCodecContext *avctx)
> {
> HCAContext *c = avctx->priv_data;
> - GetBitContext *gb = &c->gb;
> + GetByteContext gb0, *const gb = &gb0;
> int8_t r[16] = { 0 };
> float scale = 1.f / 8.f;
> unsigned b, chunk;
> @@ -118,41 +119,42 @@ static av_cold int decode_init(AVCodecContext *avctx)
> if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 16)
> return AVERROR(EINVAL);
>
> - ret = init_get_bits8(gb, avctx->extradata, avctx->extradata_size);
> - if (ret < 0)
> - return ret;
> - skip_bits_long(gb, 32);
> - version = get_bits(gb, 16);
> - skip_bits_long(gb, 16);
> + if (avctx->extradata_size < 36)
> + return AVERROR_INVALIDDATA;
> + bytestream2_init(gb, avctx->extradata, avctx->extradata_size);
> +
> + bytestream2_skipu(gb, 4);
> + version = bytestream2_get_be16(gb);
> + bytestream2_skipu(gb, 2);
>
> c->ath_type = version >= 0x200 ? 0 : 1;
>
> - if (get_bits_long(gb, 32) != MKBETAG('f', 'm', 't', 0))
> + if (bytestream2_get_be32u(gb) != MKBETAG('f', 'm', 't', 0))
> return AVERROR_INVALIDDATA;
> - skip_bits_long(gb, 32);
> - skip_bits_long(gb, 32);
> - skip_bits_long(gb, 32);
> + bytestream2_skipu(gb, 4);
> + bytestream2_skipu(gb, 4);
> + bytestream2_skipu(gb, 4);
>
> - chunk = get_bits_long(gb, 32);
> + chunk = bytestream2_get_be32u(gb);
> if (chunk == MKBETAG('c', 'o', 'm', 'p')) {
> - skip_bits_long(gb, 16);
> - skip_bits_long(gb, 8);
> - skip_bits_long(gb, 8);
> - c->track_count = get_bits(gb, 8);
> - c->channel_config = get_bits(gb, 8);
> - c->total_band_count = get_bits(gb, 8);
> - c->base_band_count = get_bits(gb, 8);
> - c->stereo_band_count = get_bits(gb, 8);
> - c->bands_per_hfr_group = get_bits(gb, 8);
> + bytestream2_skipu(gb, 2);
> + bytestream2_skipu(gb, 1);
> + bytestream2_skipu(gb, 1);
> + c->track_count = bytestream2_get_byteu(gb);
> + c->channel_config = bytestream2_get_byteu(gb);
> + c->total_band_count = bytestream2_get_byteu(gb);
> + c->base_band_count = bytestream2_get_byteu(gb);
> + c->stereo_band_count = bytestream2_get_byte (gb);
> + c->bands_per_hfr_group = bytestream2_get_byte (gb);
> } else if (chunk == MKBETAG('d', 'e', 'c', 0)) {
> - skip_bits_long(gb, 16);
> - skip_bits_long(gb, 8);
> - skip_bits_long(gb, 8);
> - c->total_band_count = get_bits(gb, 8) + 1;
> - c->base_band_count = get_bits(gb, 8) + 1;
> - c->track_count = get_bits(gb, 4);
> - c->channel_config = get_bits(gb, 4);
> - if (!get_bits(gb, 8))
> + bytestream2_skipu(gb, 2);
> + bytestream2_skipu(gb, 1);
> + bytestream2_skipu(gb, 1);
> + c->total_band_count = bytestream2_get_byteu(gb) + 1;
> + c->base_band_count = bytestream2_get_byteu(gb) + 1;
> + c->track_count = bytestream2_peek_byteu(gb) >> 4;
> + c->channel_config = bytestream2_get_byteu(gb) & 0xF;
> + if (!bytestream2_get_byteu(gb))
> c->base_band_count = c->total_band_count;
> c->stereo_band_count = c->total_band_count - c->base_band_count;
> c->bands_per_hfr_group = 0;
> @@ -163,24 +165,20 @@ static av_cold int decode_init(AVCodecContext *avctx)
> return AVERROR_INVALIDDATA;
>
>
> - while (get_bits_left(gb) >= 32) {
> - chunk = get_bits_long(gb, 32);
> + while (bytestream2_get_bytes_left(gb) >= 4) {
> + chunk = bytestream2_get_be32u(gb);
> if (chunk == MKBETAG('v', 'b', 'r', 0)) {
> - skip_bits_long(gb, 16);
> - skip_bits_long(gb, 16);
> + bytestream2_skip(gb, 2 + 2);
> } else if (chunk == MKBETAG('a', 't', 'h', 0)) {
> - c->ath_type = get_bits(gb, 16);
> + c->ath_type = bytestream2_get_be16(gb);
> } else if (chunk == MKBETAG('r', 'v', 'a', 0)) {
> - skip_bits_long(gb, 32);
> + bytestream2_skip(gb, 4);
> } else if (chunk == MKBETAG('c', 'o', 'm', 'm')) {
> - skip_bits_long(gb, get_bits(gb, 8) * 8);
> + bytestream2_skip(gb, bytestream2_get_byte(gb) * 8);
> } else if (chunk == MKBETAG('c', 'i', 'p', 'h')) {
> - skip_bits_long(gb, 16);
> + bytestream2_skip(gb, 2);
> } else if (chunk == MKBETAG('l', 'o', 'o', 'p')) {
> - skip_bits_long(gb, 32);
> - skip_bits_long(gb, 32);
> - skip_bits_long(gb, 16);
> - skip_bits_long(gb, 16);
> + bytestream2_skip(gb, 4 + 4 + 2 + 2);
> } else if (chunk == MKBETAG('p', 'a', 'd', 0)) {
> break;
> } else {
Will apply this patchset later today unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-24 9:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-22 1:42 [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 2/3] avcodec/hcadec: Move transient GetBitContext to stack Andreas Rheinhardt
2022-06-22 1:43 ` [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Don't use show_bits_long() unnecessarily Andreas Rheinhardt
2022-06-24 9:50 ` [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads Andreas Rheinhardt
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git