change default padding to 8K, or 64K if input audio stream is >= 20 minutes long

2025-12-16 18:54:26 +00:00 · 2006-09-27 05:39:00 +00:00
parent 6f5568e4df
commit 2f3e673e30
22 changed files with 23 additions and 22 deletions
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1516,7 +1516,8 @@ void show_explain()
 	printf("                               of the 4 metadata block header bytes.  You can\n");
 	printf("                               force no PADDING block at all to be written with\n");
 	printf("                               --no-padding.  The encoder writes a PADDING\n");
-	printf("                               block of 4096 bytes by default.\n");
+	printf("                               block of 8192 bytes by default, or 65536 bytes\n");
+	printf("                               if the input audio is more than 20 minutes long.\n");
 	printf("  -b, --blocksize=#            Specify the blocksize in samples; the default is\n");
 	printf("                               1152 for -l 0, else 4608; must be one of 192,\n");
 	printf("                               576, 1152, 2304, 4608, 256, 512, 1024, 2048,\n");
--- a/test/flac-to-flac-metadata-test-files/case01e-expect.meta
+++ b/test/flac-to-flac-metadata-test-files/case01e-expect.meta
@@ -76,4 +76,4 @@ METADATA block #4
 METADATA block #5
  type: 1 (PADDING)
  is last: true
-  length: 4096
+  length: 8192
--- a/test/metaflac-test-files/case00-expect.meta
+++ b/test/metaflac-test-files/case00-expect.meta
@@ -21,4 +21,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 4096
+  length: 8192
--- a/test/metaflac-test-files/case02-expect.meta
+++ b/test/metaflac-test-files/case02-expect.meta
@@ -21,7 +21,7 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: false
-  length: 4096
+  length: 8192
 METADATA block #4
  type: 1 (PADDING)
  is last: true
--- a/test/metaflac-test-files/case03-expect.meta
+++ b/test/metaflac-test-files/case03-expect.meta
@@ -22,4 +22,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16392
+  length: 20488
--- a/test/metaflac-test-files/case04-expect.meta
+++ b/test/metaflac-test-files/case04-expect.meta
@@ -23,4 +23,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16368
+  length: 20464
--- a/test/metaflac-test-files/case05-expect.meta
+++ b/test/metaflac-test-files/case05-expect.meta
@@ -24,4 +24,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16353
+  length: 20449
--- a/test/metaflac-test-files/case06-expect.meta
+++ b/test/metaflac-test-files/case06-expect.meta
@@ -25,4 +25,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16319
+  length: 20415
--- a/test/metaflac-test-files/case08-expect.meta
+++ b/test/metaflac-test-files/case08-expect.meta
@@ -24,4 +24,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16372
+  length: 20468
--- a/test/metaflac-test-files/case09-expect.meta
+++ b/test/metaflac-test-files/case09-expect.meta
@@ -22,4 +22,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16411
+  length: 20507
--- a/test/metaflac-test-files/case13-expect.meta
+++ b/test/metaflac-test-files/case13-expect.meta
@@ -7,4 +7,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16411
+  length: 20507
--- a/test/metaflac-test-files/case14-expect.meta
+++ b/test/metaflac-test-files/case14-expect.meta
@@ -10,4 +10,4 @@ METADATA block #0
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16411
+  length: 20507
--- a/test/metaflac-test-files/case15-expect.meta
+++ b/test/metaflac-test-files/case15-expect.meta
@@ -13,4 +13,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 16411
+  length: 20507
--- a/test/metaflac-test-files/case16-expect.meta
+++ b/test/metaflac-test-files/case16-expect.meta
@@ -22,7 +22,7 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: false
-  length: 16411
+  length: 20507
 METADATA block #4
  type: 1 (PADDING)
  is last: false
--- a/test/metaflac-test-files/case17-expect.meta
+++ b/test/metaflac-test-files/case17-expect.meta
@@ -22,4 +22,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 25061
+  length: 29157
--- a/test/metaflac-test-files/case18-expect.meta
+++ b/test/metaflac-test-files/case18-expect.meta
@@ -22,7 +22,7 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: false
-  length: 25061
+  length: 29157
 METADATA block #4
  type: 1 (PADDING)
  is last: true
--- a/test/metaflac-test-files/case19-expect.meta
+++ b/test/metaflac-test-files/case19-expect.meta
@@ -22,4 +22,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 25065
+  length: 29161
--- a/test/metaflac-test-files/case20-expect.meta
+++ b/test/metaflac-test-files/case20-expect.meta
@@ -22,7 +22,7 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: false
-  length: 25065
+  length: 29161
 METADATA block #4
  type: 1 (PADDING)
  is last: true
--- a/test/metaflac-test-files/case21-expect.meta
+++ b/test/metaflac-test-files/case21-expect.meta
@@ -21,4 +21,4 @@ METADATA block #2
 METADATA block #3
  type: 1 (PADDING)
  is last: true
-  length: 25103
+  length: 29199
--- a/test/metaflac-test-files/case22-expect.meta
+++ b/test/metaflac-test-files/case22-expect.meta
@@ -15,4 +15,4 @@ METADATA block #1
 METADATA block #2
  type: 1 (PADDING)
  is last: true
-  length: 25103
+  length: 29199
--- a/test/metaflac-test-files/case23-expect.meta
+++ b/test/metaflac-test-files/case23-expect.meta
@@ -15,4 +15,4 @@ METADATA block #1
 METADATA block #2
  type: 1 (PADDING)
  is last: true
-  length: 25103
+  length: 29199
--- a/test/metaflac-test-files/case24-expect.meta
+++ b/test/metaflac-test-files/case24-expect.meta
@@ -15,4 +15,4 @@ METADATA block #1
 METADATA block #2
  type: 1 (PADDING)
  is last: true
-  length: 25103
+  length: 29199