Merged 2289

config.h.mingw

@@ -4,6 +4,9 @@
 /* Define to 1 if you have the <expat.h> header file. */
 #define HAVE_EXPAT_H 1
 
+/* Define if FLAC__stream_decoder_skip_single_frame exists */
+/* #undef HAVE_FLAC_DECODER_SKIP 1 */
+
 /* Define to 1 if you have the <FLAC/format.h> header file. */
 #define HAVE_FLAC_FORMAT_H 1
 

configure.in

@@ -380,10 +380,10 @@ dnl
                  [ flac_decoder_skip_found=no ],
                  $FLAC_LIBS)
     if test x"$flac_decoder_skip_found" = xyes; then
-      opt_features_yes="$opt_features_yes; FLAC audio (fast)"
+      opt_features_yes="$opt_features_yes; FLAC audio (1.1.1 or newer)"
       AC_DEFINE(HAVE_FLAC_DECODER_SKIP, [1], [Define if FLAC__stream_decoder_skip_single_frame exists])
     else
-      opt_features_yes="$opt_features_yes; FLAC audio"
+      opt_features_yes="$opt_features_yes; FLAC audio (1.1.0 or older)"
     fi
     AC_DEFINE(HAVE_FLAC_FORMAT_H, [1], [Define if the FLAC headers are present])
   else

src/common/flac_common.cpp

@@ -252,6 +252,8 @@ flac_decode_headers(unsigned char *mem,
     }
   }
 
+  FLAC__stream_decoder_delete(decoder);
+
   return result;
 }
 

src/input/r_flac.cpp

@@ -24,10 +24,11 @@
 #include <FLAC/stream_decoder.h>
 #endif
 
-#include "mkvmerge.h"
 #include "common.h"
-#include "pr_generic.h"
+#include "flac_common.h"
 #include "matroska.h"
+#include "mkvmerge.h"
+#include "pr_generic.h"
 #include "r_flac.h"
 
 #define BUFFER_SIZE 4096
@@ -153,6 +154,7 @@ bool
 flac_reader_c::parse_file() {
   FLAC__StreamDecoder *decoder;
   int result;
+  bool ok;
 
   done = false;
   file->setFilePointer(0);
@@ -181,11 +183,47 @@ flac_reader_c::parse_file() {
     mxerror(FPFX "Could not initialize the FLAC decoder.\n");
 
   old_progress = -5;
-  result = (int)FLAC__stream_decoder_process_until_end_of_stream(decoder);
-  mxinfo("+-> Pre-parsing FLAC file: 100%%\n");
-  mxverb(2, FPFX "extract, result: %d, mdp: %d, num blocks: %u\n",
+  result = (int)FLAC__stream_decoder_process_until_end_of_metadata(decoder);
+  mxverb(2, FPFX "extract->metadata, result: %d, mdp: %d, num blocks: %u\n",
          result, metadata_parsed, blocks.size());
 
+  if (!metadata_parsed)
+    mxerror(FMT_FN "No metadata block found. This file is broken.\n",
+            ti->fname);
+
+#if defined(HAVE_FLAC_DECODER_SKIP)
+  ok = FLAC__stream_decoder_skip_single_frame(decoder);
+#else
+  ok = FLAC__stream_decoder_process_single(decoder);
+#endif
+  while (ok) {
+    FLAC__StreamDecoderState state;
+    flac_block_t block;
+
+    state = FLAC__stream_decoder_get_state(decoder);
+    if ((state == FLAC__STREAM_DECODER_END_OF_STREAM) ||
+        (state == FLAC__STREAM_DECODER_ABORTED) ||
+        (state == FLAC__STREAM_DECODER_UNPARSEABLE_STREAM))
+      break;
+    
+    block.type = FLAC_BLOCK_TYPE_DATA;
+    block.filepos = packet_start;
+    block.len = (file->getFilePointer() - size + pos) - packet_start;
+    packet_start = file->getFilePointer() - size + pos;
+    blocks.push_back(block);
+
+    mxverb(2, FPFX "skip frame, block at %lld with size %d\n",
+           block.filepos, block.len);
+
+#if defined(HAVE_FLAC_DECODER_SKIP)
+    ok = FLAC__stream_decoder_skip_single_frame(decoder);
+#else
+    ok = FLAC__stream_decoder_process_single(decoder);
+#endif
+  }
+
+  mxinfo("+-> Pre-parsing FLAC file: 100%%\n");
+
   if ((blocks.size() < 3) || (blocks[1].type != FLAC_BLOCK_TYPE_HEADERS))
     mxerror(FPFX "Could not read all header packets.\n");
 
@@ -203,6 +241,7 @@ int
 flac_reader_c::read(generic_packetizer_c *,
                     bool) {
   unsigned char *buf;
+  int samples_here;
 
   if (current_block == blocks.end())
     return 0;
@@ -214,8 +253,9 @@ flac_reader_c::read(generic_packetizer_c *,
     return 0;
   }
   memory_c mem(buf, current_block->len, true);
+  samples_here = flac_get_num_samples(buf, current_block->len, stream_info);
   PTZR0->process(mem, samples * 1000000000 / sample_rate);
-  samples += current_block->samples;
+  samples += samples_here;
   current_block++;
 
   if (current_block == blocks.end()) {
@@ -261,20 +301,8 @@ flac_reader_c::read_cb(FLAC__byte buffer[],
 }
 
 FLAC__StreamDecoderWriteStatus
-flac_reader_c::write_cb(const FLAC__Frame *frame,
+flac_reader_c::write_cb(const FLAC__Frame *,
                         const FLAC__int32 * const []) {
-  flac_block_t block;
-
-  block.type = FLAC_BLOCK_TYPE_DATA;
-  block.filepos = packet_start;
-  block.len = (file->getFilePointer() - size + pos) - packet_start;
-  block.samples = frame->header.blocksize;
-  packet_start = file->getFilePointer() - size + pos;
-  blocks.push_back(block);
-
-  mxverb(2, FPFX "write cb, block at %lld with size %d\n", block.filepos,
-         block.len);
-
   return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
@@ -300,6 +328,8 @@ flac_reader_c::metadata_cb(const FLAC__StreamMetadata *metadata) {
       mxverb(2, FPFX "  channels: %u\n", metadata->data.stream_info.channels);
       mxverb(2, FPFX "  bits_per_sample: %u\n",
              metadata->data.stream_info.bits_per_sample);
+      memcpy(&stream_info, &metadata->data.stream_info,
+             sizeof(FLAC__StreamMetadata_StreamInfo));
       metadata_parsed = true;
       break;
     default:

src/input/r_flac.h

@@ -32,7 +32,7 @@
 
 typedef struct {
   int64_t filepos;
-  int type, len, samples;
+  int type, len;
 } flac_block_t;
 
 class flac_reader_c: public generic_reader_c {
@@ -46,6 +46,7 @@ private:
   int header_size;
   vector<flac_block_t> blocks;
   vector<flac_block_t>::iterator current_block;
+  FLAC__StreamMetadata_StreamInfo stream_info;
 
 public:
   flac_reader_c(track_info_c *nti) throw (error_c);