Frontend: do not swallow the first frame (#149)

Other tools don't. Typically encoder input is primed, so there is no reason to drop decoded data.

Eugene Kliuchnikov committed 3 years ago

Commit d062deb1 parent 88d280c3 files · +13 −9Browse files

Unified · Split

3 files

@@ -111,19 +111,19 @@ audio_file open_audio_file(char infile, int samplerate, int channels, · 110 unmodified lines
111	return aufile;	111	return aufile;
112	}	112	}
113		113
114	int write_audio_file(audio_file aufile, void sample_buffer, int samples, int offset)	114	int write_audio_file(audio_file aufile, void sample_buffer, int samples)
115	{	115	{
116	char buf = (char )sample_buffer;	116	char buf = (char )sample_buffer;
117	switch (aufile->outputFormat)	117	switch (aufile->outputFormat)
118	{	118	{
119	case FAAD_FMT_16BIT:	119	case FAAD_FMT_16BIT:
120	return write_audio_16bit(aufile, buf + offset*2, samples);	120	return write_audio_16bit(aufile, buf, samples);
121	case FAAD_FMT_24BIT:	121	case FAAD_FMT_24BIT:
122	return write_audio_24bit(aufile, buf + offset*4, samples);	122	return write_audio_24bit(aufile, buf, samples);
123	case FAAD_FMT_32BIT:	123	case FAAD_FMT_32BIT:
124	return write_audio_32bit(aufile, buf + offset*4, samples);	124	return write_audio_32bit(aufile, buf, samples);
125	case FAAD_FMT_FLOAT:	125	case FAAD_FMT_FLOAT:
126	return write_audio_float(aufile, buf + offset*4, samples);	126	return write_audio_float(aufile, buf, samples);
127	default:	127	default:
128	return 0;	128	return 0;
129	}	129	}

@@ -55,7 +55,7 @@ typedef struct · 54 unmodified lines
55		55
56	audio_file open_audio_file(char infile, int samplerate, int channels,	56	audio_file open_audio_file(char infile, int samplerate, int channels,
57	int outputFormat, int fileType, long channelMask);	57	int outputFormat, int fileType, long channelMask);
58	int write_audio_file(audio_file aufile, void sample_buffer, int samples, int offset);	58	int write_audio_file(audio_file aufile, void sample_buffer, int samples);
59	void close_audio_file(audio_file *aufile);	59	void close_audio_file(audio_file *aufile);
60		60
61	#ifdef __cplusplus	61	#ifdef __cplusplus

         break;
     }
+    // Override the logic of skipping 0-th output frame.
+    NeAACDecPostSeekReset(hDecoder, 1);
     if (infoOnly)
     {
         NeAACDecClose(hDecoder);
         if ((frameInfo.error == 0) && (frameInfo.samples > 0) && (!adts_out))
         {
-            if (write_audio_file(aufile, sample_buffer, frameInfo.samples, 0) == 0)
+            if (write_audio_file(aufile, sample_buffer, frameInfo.samples) == 0)
                 break;
         }
         /*int rc;*/
         long dur;
         unsigned int sample_count;
-        unsigned int delay = 0;
         if (mp4read_frame())
             break;
         if ((frameInfo.error == 0) && (sample_count > 0) && (!adts_out))
         {
-            if (write_audio_file(aufile, sample_buffer, sample_count, delay) == 0)
+            if (write_audio_file(aufile, sample_buffer, sample_count) == 0)
                 break;
         }
                     outputFormat = atoi(dr);
                     if ((outputFormat < 1) || (outputFormat > 5))
                         showHelp = 1;
+                    if (outputFormat == 5)  // Not yet unsupported by "audio".
+                        showHelp = 1;
                 }
             }
             break;

Keyboard shortcuts