[FFmpeg-cvslog] avformat/ivfenc: remove unused var
ffmpeg | branch: master | Gyan Doshi | Wed Apr 17 17:16:44
2024 +0530| [38c322681e9715b288172eaed1e90205aa46e969] | committer: Gyan Doshi
avformat/ivfenc: remove unused var
sum_delta_pts is unused since 3b358f151d
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c322681e9715b288172eaed1e90205aa46e969
---
libavformat/ivfenc.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index 09782eecd6..9feaea3516 100644
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@ -24,7 +24,7 @@
typedef struct IVFEncContext {
unsigned frame_cnt;
-uint64_t last_pts, sum_delta_pts, last_pkt_duration;
+uint64_t last_pts, last_pkt_duration;
} IVFEncContext;
static int ivf_init(AVFormatContext *s)
@@ -80,8 +80,6 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
avio_wl32(pb, pkt->size);
avio_wl64(pb, pkt->pts);
avio_write(pb, pkt->data, pkt->size);
-if (ctx->frame_cnt)
-ctx->sum_delta_pts += pkt->pts - ctx->last_pts;
ctx->last_pkt_duration = pkt->duration;
ctx->frame_cnt++;
ctx->last_pts = pkt->pts;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_colorspace: use colorspace negotiation API
ffmpeg | branch: master | Nicolas Gaullier | Thu
Apr 4 19:05:14 2024 +0200| [376b3d53c54791c1be58709df4303ba2b90851bc] |
committer: Niklas Haas
avfilter/vf_colorspace: use colorspace negotiation API
Fixes a regression due to the fact that the colorspace filter does
not use the new API introduced by 8c7934f73ab6c568acaa.
The scale filter uses it since 45e09a30419cc2a7251e, and the setparams
filter since 3bf80df3ccd32aed23f0.
Example:
ffprobe -f lavfi yuvtestsrc,setparams=color_primaries=bt470bg:color_trc=
bt470bg:colorspace=bt470bg,colorspace=bt709:range=tv,scale,showinfo
Before:
color_range:unknown color_space:bt470bg ...
After:
color_range:tv color_space:bt709 ...
Signed-off-by: Nicolas Gaullier
Signed-off-by: Niklas Haas
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=376b3d53c54791c1be58709df4303ba2b90851bc
---
libavfilter/vf_colorspace.c | 62 ++---
1 file changed, 36 insertions(+), 26 deletions(-)
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index d181e81ace..7bacd7892a 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -433,8 +433,7 @@ static int create_filtergraph(AVFilterContext *ctx,
if (out->color_trc != s->out_trc) s->out_txchr = NULL;
if (in->colorspace != s->in_csp ||
in->color_range != s->in_rng) s->in_lumacoef = NULL;
-if (out->colorspace != s->out_csp ||
-out->color_range != s->out_rng) s->out_lumacoef = NULL;
+if (out->color_range != s->out_rng) s->rgb2yuv = NULL;
if (!s->out_primaries || !s->in_primaries) {
s->in_prm = in->color_primaries;
@@ -563,26 +562,8 @@ static int create_filtergraph(AVFilterContext *ctx,
redo_yuv2rgb = 1;
}
-if (!s->out_lumacoef) {
-s->out_csp = out->colorspace;
+if (!s->rgb2yuv) {
s->out_rng = out->color_range;
-s->out_lumacoef = av_csp_luma_coeffs_from_avcsp(s->out_csp);
-if (!s->out_lumacoef) {
-if (s->out_csp == AVCOL_SPC_UNSPECIFIED) {
-if (s->user_all == CS_UNSPECIFIED) {
-av_log(ctx, AV_LOG_ERROR,
- "Please specify output colorspace\n");
-} else {
-av_log(ctx, AV_LOG_ERROR,
- "Unsupported output color property %d\n",
s->user_all);
-}
-} else {
-av_log(ctx, AV_LOG_ERROR,
- "Unsupported output colorspace %d (%s)\n", s->out_csp,
- av_color_space_name(s->out_csp));
-}
-return AVERROR(EINVAL);
-}
redo_rgb2yuv = 1;
}
@@ -687,6 +668,26 @@ static av_cold int init(AVFilterContext *ctx)
{
ColorSpaceContext *s = ctx->priv;
+s->out_csp = s->user_csp == AVCOL_SPC_UNSPECIFIED ?
+ default_csp[FFMIN(s->user_all, CS_NB)] : s->user_csp;
+s->out_lumacoef = av_csp_luma_coeffs_from_avcsp(s->out_csp);
+if (!s->out_lumacoef) {
+if (s->out_csp == AVCOL_SPC_UNSPECIFIED) {
+if (s->user_all == CS_UNSPECIFIED) {
+av_log(ctx, AV_LOG_ERROR,
+ "Please specify output colorspace\n");
+} else {
+av_log(ctx, AV_LOG_ERROR,
+ "Unsupported output color property %d\n", s->user_all);
+}
+} else {
+av_log(ctx, AV_LOG_ERROR,
+ "Unsupported output colorspace %d (%s)\n", s->out_csp,
+ av_color_space_name(s->out_csp));
+}
+return AVERROR(EINVAL);
+}
+
ff_colorspacedsp_init(&s->dsp);
return 0;
@@ -735,6 +736,9 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
return res;
}
+out->colorspace = s->out_csp;
+out->color_range = s->user_rng == AVCOL_RANGE_UNSPECIFIED ?
+ in->color_range : s->user_rng;
out->color_primaries = s->user_prm == AVCOL_PRI_UNSPECIFIED ?
default_prm[FFMIN(s->user_all, CS_NB)] :
s->user_prm;
if (s->user_trc == AVCOL_TRC_UNSPECIFIED) {
@@ -746,10 +750,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
} else {
out->color_trc = s->user_trc;
}
-out->colorspace = s->user_csp == AVCOL_SPC_UNSPECIFIED ?
- default_csp[FFMIN(s->user_all, CS_NB)] :
s->user_csp;
-out->color_range = s->user_rng == AVCOL_RANGE_UNSPECIFIED ?
- in->color_range : s->user_rng;
if (rgb_sz != s->rgb_sz) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(out->format);
int uvw = in->width >> desc->log2_chroma_w;
@@ -841,8 +841,18 @@ static int query_formats(AVFilterContext *ctx)
};
int res;
ColorSpaceContext *s = ctx->priv;
+AVFilterLink *outlink = ctx->outputs[0];
AVFilterFormats *form
[FFmpeg-cvslog] avcodec/ac3: Remove unused fixed-point ARMv7 DSP
ffmpeg | branch: master | Geoff Hill | Wed Apr 17
22:42:17 2024 -0700| [1abba59738d99be72dee4a70c3ee2e2c724031b9] | committer:
Lynne
avcodec/ac3: Remove unused fixed-point ARMv7 DSP
This diff removes 4 unused ARMv7 NEON fixed-point DSP functions.
The function were originally moved here by 4958f35a2 (Dec 2013).
After 9e05421db (Jan 2021), as part of the refactor of the AC3
DSP to consistently use 32-bit sample format in the encoder, these
functions were removed from the DSP function table, but the ARMv7
implementations were kept.
Signed-off-by: Geoff Hill
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1abba59738d99be72dee4a70c3ee2e2c724031b9
---
libavcodec/arm/ac3dsp_neon.S | 63
1 file changed, 63 deletions(-)
diff --git a/libavcodec/arm/ac3dsp_neon.S b/libavcodec/arm/ac3dsp_neon.S
index 89d0ae8048..dc829541aa 100644
--- a/libavcodec/arm/ac3dsp_neon.S
+++ b/libavcodec/arm/ac3dsp_neon.S
@@ -20,25 +20,6 @@
#include "libavutil/arm/asm.S"
-function ff_ac3_max_msb_abs_int16_neon, export=1
-vmov.i16q0, #0
-vmov.i16q2, #0
-1: vld1.16 {q1}, [r0,:128]!
-vabs.s16q1, q1
-vld1.16 {q3}, [r0,:128]!
-vabs.s16q3, q3
-vorrq0, q0, q1
-vorrq2, q2, q3
-subsr1, r1, #16
-bgt 1b
-vorrq0, q0, q2
-vorrd0, d0, d1
-vpmax.u16 d0, d0, d0
-vpmax.u16 d0, d0, d0
-vmov.u16r0, d0[0]
-bx lr
-endfunc
-
function ff_ac3_exponent_min_neon, export=1
cmp r1, #0
it eq
@@ -59,27 +40,6 @@ function ff_ac3_exponent_min_neon, export=1
pop {pc}
endfunc
-function ff_ac3_lshift_int16_neon, export=1
-vdup.16 q0, r2
-1: vld1.16 {q1}, [r0,:128]
-vshl.s16q1, q1, q0
-vst1.16 {q1}, [r0,:128]!
-subsr1, r1, #8
-bgt 1b
-bx lr
-endfunc
-
-function ff_ac3_rshift_int32_neon, export=1
-rsb r2, r2, #0
-vdup.32 q0, r2
-1: vld1.32 {q1}, [r0,:128]
-vshl.s32q1, q1, q0
-vst1.32 {q1}, [r0,:128]!
-subsr1, r1, #4
-bgt 1b
-bx lr
-endfunc
-
function ff_float_to_fixed24_neon, export=1
1: vld1.32 {q0-q1}, [r1,:128]!
vcvt.s32.f32q0, q0, #24
@@ -109,29 +69,6 @@ function ff_ac3_extract_exponents_neon, export=1
bx lr
endfunc
-function ff_apply_window_int16_neon, export=1
-push{r4,lr}
-add r4, r1, r3, lsl #1
-add lr, r0, r3, lsl #1
-sub r4, r4, #16
-sub lr, lr, #16
-mov r12, #-16
-1:
-vld1.16 {q0}, [r1,:128]!
-vld1.16 {q2}, [r2,:128]!
-vld1.16 {q1}, [r4,:128], r12
-vrev64.16 q3, q2
-vqrdmulh.s16q0, q0, q2
-vqrdmulh.s16d2, d2, d7
-vqrdmulh.s16d3, d3, d6
-vst1.16 {q0}, [r0,:128]!
-vst1.16 {q1}, [lr,:128], r12
-subsr3, r3, #16
-bgt 1b
-
-pop {r4,pc}
-endfunc
-
function ff_ac3_sum_square_butterfly_int32_neon, export=1
vmov.i64q0, #0
vmov.i64q1, #0
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
