Re: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
On Fri, Aug 25, 2023 at 4:21 PM Michael Niedermayer wrote: > On Fri, Aug 25, 2023 at 11:08:55AM +0200, Paul B Mahol wrote: > > On Fri, Aug 25, 2023 at 2:01 AM Michael Niedermayer < > mich...@niedermayer.cc> > > wrote: > > > > > On Fri, Aug 25, 2023 at 01:37:27AM +0200, Paul B Mahol wrote: > > > > NAK > > > > > > > > Breaks decoding of another sample. > > > > > > please provide the sample > > > > > > if noone provides a sample, i will disregard this objection. > > > Also as a sidenote, iam in contact with Matt Ashland and he also > > > doesnt know what your commit was trying to fix > > > > > > > What to say, monkey see - monkey do. > > > > > Just wasted too much time on running latest MAC converter software in > > virtualbox to confirm > > you break this ticket bellow with your patch set. > > you dont need virtualbox to run ffmpeg to test the samples > if you used virtualbox to generate more samples, please share them so > i can make sure there are no regressions on changes > > MAC is reference Monkey's APEs encoder/decoder Windows only utility. Just make sure that its not also MAC regression somehow... > > > > https://trac.ffmpeg.org/ticket/8918 > > thanks for the testcase, i will make sure my next pachset will not break > that > > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > What does censorship reveal? It reveals fear. -- Julian Assange > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
On Fri, Aug 25, 2023 at 11:08:55AM +0200, Paul B Mahol wrote: > On Fri, Aug 25, 2023 at 2:01 AM Michael Niedermayer > wrote: > > > On Fri, Aug 25, 2023 at 01:37:27AM +0200, Paul B Mahol wrote: > > > NAK > > > > > > Breaks decoding of another sample. > > > > please provide the sample > > > > if noone provides a sample, i will disregard this objection. > > Also as a sidenote, iam in contact with Matt Ashland and he also > > doesnt know what your commit was trying to fix > > > > What to say, monkey see - monkey do. > > Just wasted too much time on running latest MAC converter software in > virtualbox to confirm > you break this ticket bellow with your patch set. you dont need virtualbox to run ffmpeg to test the samples if you used virtualbox to generate more samples, please share them so i can make sure there are no regressions on changes > > https://trac.ffmpeg.org/ticket/8918 thanks for the testcase, i will make sure my next pachset will not break that [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What does censorship reveal? It reveals fear. -- Julian Assange signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
On Fri, Aug 25, 2023 at 2:01 AM Michael Niedermayer wrote: > On Fri, Aug 25, 2023 at 01:37:27AM +0200, Paul B Mahol wrote: > > NAK > > > > Breaks decoding of another sample. > > please provide the sample > > if noone provides a sample, i will disregard this objection. > Also as a sidenote, iam in contact with Matt Ashland and he also > doesnt know what your commit was trying to fix > What to say, monkey see - monkey do. Just wasted too much time on running latest MAC converter software in virtualbox to confirm you break this ticket bellow with your patch set. https://trac.ffmpeg.org/ticket/8918 My patience is lowering by each new day and each new patch(es) from you. > > thx > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > If the United States is serious about tackling the national security > threats > related to an insecure 5G network, it needs to rethink the extent to which > it > values corporate profits and government espionage over security.-Bruce > Schneier > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
On Fri, Aug 25, 2023 at 01:37:27AM +0200, Paul B Mahol wrote: > NAK > > Breaks decoding of another sample. please provide the sample if noone provides a sample, i will disregard this objection. Also as a sidenote, iam in contact with Matt Ashland and he also doesnt know what your commit was trying to fix thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If the United States is serious about tackling the national security threats related to an insecure 5G network, it needs to rethink the extent to which it values corporate profits and government espionage over security.-Bruce Schneier signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
NAK Breaks decoding of another sample. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 1/2] Revert "avcodec/apedec: fix decoding 24bit insane files with recent versions"
Fixes: Ticket9816
This reverts commit ed0001482a74b60f3d5bc5cd7e304c9d65b2fcd5.
---
libavcodec/apedec.c | 59 ++---
1 file changed, 13 insertions(+), 46 deletions(-)
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 613c76df0b..cc0d7e2749 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -134,21 +134,6 @@ typedef struct APEPredictor {
unsigned int sample_pos;
} APEPredictor;
-typedef struct APEPredictor64 {
-int64_t *buf;
-
-int64_t lastA[2];
-
-int64_t filterA[2];
-int64_t filterB[2];
-
-uint64_t coeffsA[2][4]; ///< adaption coefficients
-uint64_t coeffsB[2][5]; ///< adaption coefficients
-int64_t historybuffer[HISTORY_SIZE + PREDICTOR_SIZE];
-
-unsigned int sample_pos;
-} APEPredictor64;
-
/** Decoder context */
typedef struct APEContext {
AVClass *class; ///< class for AVOptions
@@ -168,7 +153,6 @@ typedef struct APEContext {
uint32_t CRC_state; ///< accumulated CRC
int frameflags; ///< frame flags
APEPredictor predictor; ///< predictor used for final
reconstruction
-APEPredictor64 predictor64; ///< 64bit predictor used for
final reconstruction
int32_t *decoded_buffer;
int decoded_size;
@@ -808,20 +792,13 @@ static const int32_t initial_coeffs_3930[4] = {
360, 317, -109, 98
};
-static const int64_t initial_coeffs_3930_64bit[4] = {
-360, 317, -109, 98
-};
-
static void init_predictor_decoder(APEContext *ctx)
{
APEPredictor *p = >predictor;
-APEPredictor64 *p64 = >predictor64;
/* Zero the history buffers */
memset(p->historybuffer, 0, PREDICTOR_SIZE * sizeof(*p->historybuffer));
-memset(p64->historybuffer, 0, PREDICTOR_SIZE *
sizeof(*p64->historybuffer));
p->buf = p->historybuffer;
-p64->buf = p64->historybuffer;
/* Initialize and zero the coefficients */
if (ctx->fileversion < 3930) {
@@ -839,11 +816,8 @@ static void init_predictor_decoder(APEContext *ctx)
} else {
memcpy(p->coeffsA[0], initial_coeffs_3930,
sizeof(initial_coeffs_3930));
memcpy(p->coeffsA[1], initial_coeffs_3930,
sizeof(initial_coeffs_3930));
-memcpy(p64->coeffsA[0], initial_coeffs_3930_64bit,
sizeof(initial_coeffs_3930_64bit));
-memcpy(p64->coeffsA[1], initial_coeffs_3930_64bit,
sizeof(initial_coeffs_3930_64bit));
}
memset(p->coeffsB, 0, sizeof(p->coeffsB));
-memset(p64->coeffsB, 0, sizeof(p64->coeffsB));
if (ctx->fileversion < 3930) {
memcpy(p->coeffsB[0], initial_coeffs_b_3800,
sizeof(initial_coeffs_b_3800));
@@ -855,13 +829,7 @@ static void init_predictor_decoder(APEContext *ctx)
p->filterB[0] = p->filterB[1] = 0;
p->lastA[0] = p->lastA[1] = 0;
-p64->filterA[0] = p64->filterA[1] = 0;
-p64->filterB[0] = p64->filterB[1] = 0;
-p64->lastA[0] = p64->lastA[1] = 0;
-
p->sample_pos = 0;
-
-p64->sample_pos = 0;
}
/** Get inverse sign of integer (-1 for positive, 1 for negative and 0 for
zero) */
@@ -1181,17 +1149,16 @@ static void predictor_decode_mono_3930(APEContext *ctx,
int count)
}
}
-static av_always_inline int predictor_update_filter(APEPredictor64 *p,
+static av_always_inline int predictor_update_filter(APEPredictor *p,
const int decoded, const
int filter,
const int delayA, const
int delayB,
const int adaptA, const
int adaptB)
{
-int64_t predictionA, predictionB;
-int32_t sign;
+int32_t predictionA, predictionB, sign;
p->buf[delayA] = p->lastA[filter];
p->buf[adaptA] = APESIGN(p->buf[delayA]);
-p->buf[delayA - 1] = p->buf[delayA] - (uint64_t)p->buf[delayA - 1];
+p->buf[delayA - 1] = p->buf[delayA] - (unsigned)p->buf[delayA - 1];
p->buf[adaptA - 1] = APESIGN(p->buf[delayA - 1]);
predictionA = p->buf[delayA] * p->coeffsA[filter][0] +
@@ -1200,9 +1167,9 @@ static av_always_inline int
predictor_update_filter(APEPredictor64 *p,
p->buf[delayA - 3] * p->coeffsA[filter][3];
/* Apply a scaled first-order filter compression */
-p->buf[delayB] = p->filterA[filter ^ 1] -
((int64_t)(p->filterB[filter] * 31ULL) >> 5);
+p->buf[delayB] = p->filterA[filter ^ 1] - ((int)(p->filterB[filter] *
31U) >> 5);
p->buf[adaptB] = APESIGN(p->buf[delayB]);
-p->buf[delayB - 1] = p->buf[delayB] - (uint64_t)p->buf[delayB - 1];
+p->buf[delayB - 1] = p->buf[delayB] - (unsigned)p->buf[delayB - 1];
p->buf[adaptB - 1] = APESIGN(p->buf[delayB - 1]);
p->filterB[filter] = p->filterA[filter ^ 1];
@@ -1212,8 +1179,8 @@ static av_always_inline int
predictor_update_filter(APEPredictor64 *p,
p->buf[delayB - 3] *
