Hi, I am sorry for my mistakes. I have fixed them. And attachment is the
patch which fix error in first one. Thanks.
2017-04-16 15:25 GMT-04:00 Michael Niedermayer <mich...@niedermayer.cc>:
> On Sun, Apr 16, 2017 at 09:19:33AM -0400, Ruyi Ji wrote:
> > Signed-off-by: Ruyi Ji <jiru...@gmail.com>
> > ---
> > libavcodec/psymodel.c | 1 +
> > libavcodec/vorbis_enc_data.h | 111 ++++++++++++++++++++++++++++++
> +++++++++++++
> > libavcodec/vorbisenc.c | 60 +++++++++++++++++++++++
> > 3 files changed, 172 insertions(+)
>
> This seems to fail to build here
>
> CC libavcodec/vorbisenc.o
> libavcodec/vorbisenc.c:133:45: error: ‘MAX_CHANNELS’ undeclared here (not
> in a function)
> libavcodec/vorbisenc.c: In function ‘vorbis_encode_frame’:
> libavcodec/vorbisenc.c:1057:25: error: expected ‘;’ before ‘if’
> libavcodec/vorbisenc.c: In function ‘vorbis_encode_close’:
> libavcodec/vorbisenc.c:1196:9: error: incompatible type for argument 1 of
> ‘ff_psy_end’
> libavcodec/psymodel.h:176:6: note: expected ‘struct FFPsyContext *’ but
> argument is of type ‘FFPsyContext’
> make: *** [libavcodec/vorbisenc.o] Error 1
> make: Target `all' not remade because of errors.
>
>
> >
> > diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
> > index 2b5f111..2e11c48 100644
> > --- a/libavcodec/psymodel.c
> > +++ b/libavcodec/psymodel.c
> > @@ -62,6 +62,7 @@ av_cold int ff_psy_init(FFPsyContext *ctx,
> AVCodecContext *avctx, int num_lens,
> >
> > switch (ctx->avctx->codec_id) {
> > case AV_CODEC_ID_AAC:
> > + case AV_CODEC_ID_VORBIS:
> > ctx->model = &ff_aac_psy_model;
>
> tabs are forbidden in ffmpeg-git except where needed for syntax
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> In fact, the RIAA has been known to suggest that students drop out
> of college or go to community college in order to be able to afford
> settlements. -- The RIAA
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>
From 2629cada2ed6aa843736762cfe536c4489628272 Mon Sep 17 00:00:00 2001
From: Ruyi Ji <jiru...@gmail.com>
Date: Sun, 16 Apr 2017 21:41:44 -0400
Subject: [PATCH 2/2] this patch is one can build.
Signed-off-by: Ruyi Ji <jiru...@gmail.com>
---
libavcodec/vorbisenc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 9f1adf8..09ad446 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -98,6 +98,8 @@ typedef struct vorbis_enc_mode {
int mapping;
} vorbis_enc_mode;
+#define MAX_CHANNELS 2
+
typedef struct vorbis_enc_context {
int channels;
int sample_rate;
@@ -133,7 +135,6 @@ typedef struct vorbis_enc_context {
enum WindowSequence window_sequence[MAX_CHANNELS];
} vorbis_enc_context;
-#define MAX_CHANNELS 2
#define MAX_CODEBOOK_DIM 8
#define MAX_FLOOR_CLASS_DIM 4
@@ -1053,7 +1054,7 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
cur_channel = start_ch + ch;
overlap = &audio[cur_channel][0];
samples2 = overlap + 1024;
- la = samples2 + (448 + 64)
+ la = samples2 + (448 + 64);
if (!frame)
la = NULL;
wi[ch] = venc->psy.model->window(&venc->psy, samples2, la, cur_channel, venc->window_sequence[0]);
@@ -1193,7 +1194,7 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx)
ff_mdct_end(&venc->mdct[0]);
ff_mdct_end(&venc->mdct[1]);
- ff_psy_end(venc->psy);
+ ff_psy_end(&venc->psy);
if (venc->psypp)
ff_psy_preprocess_end(venc->psypp);
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
