Rename and adjust positioning of new nxof stuff

doc/FORMATS.md

@@ -1124,10 +1124,6 @@ different internally (encrypted, different versions, etc) and not always can be
   - Entergram NXA header [*NXA*]
   - *opus_nxa*: `.nxa`
   - Codecs: Opus
-- **fdk_nxopus.c**
-  - Nihon Falcom FDK Opus Header [*FDK_NXOPUS*]
-  - *opus_fdk*: `.nxopus`
-  - Codecs: Opus
 - **pc_ast.c**
   - Capcom AST (PC) header [*PC_AST*]
   - *pc_ast*: `.ast`
@@ -1795,6 +1791,10 @@ different internally (encrypted, different versions, etc) and not always can be
 - **snds.c**
   - Sony SNDS header [*SNDS*]
   - Codecs: ATRAC9
+- **nxof.c**
+  - Nihon Falcom FDK Opus Header [*NXOF*]
+  - *nxof*: `.nxopus`
+  - Codecs: Opus
 - **scd_pcm.c**
   - Lunar: Eternal Blue .PCM header [*SCD_PCM*]
   - *scd_pcm*: `.pcm`

src/formats.c

@@ -1417,7 +1417,7 @@ static const meta_info meta_info_list[] = {
         {meta_SQUEAKSTREAM,         "Torus SqueakStream header"},
         {meta_SQUEAKSAMPLE,         "Torus SqueakSample header"},
         {meta_SNDS,                 "Sony SNDS header"},
-        {meta_FDK_NXOPUS,           "Nihon Falcom FDK Opus Header"},
+        {meta_NXOF,                 "Nihon Falcom FDK Opus Header"},
 };
 
 void get_vgmstream_coding_description(VGMSTREAM* vgmstream, char* out, size_t out_size) {

src/libvgmstream.vcxproj

@@ -425,7 +425,6 @@
     <ClCompile Include="meta\ezw.c" />
     <ClCompile Include="meta\fag.c" />
     <ClCompile Include="meta\fda.c" />
-    <ClCompile Include="meta\fdk_nxopus.c" />
     <ClCompile Include="meta\ffdl.c" />
     <ClCompile Include="meta\ffmpeg.c" />
     <ClCompile Include="meta\ffw.c" />
@@ -536,6 +535,7 @@
     <ClCompile Include="meta\nwav.c" />
     <ClCompile Include="meta\nxa.c" />
     <ClCompile Include="meta\nxap.c" />
+    <ClCompile Include="meta\nxof.c" />
     <ClCompile Include="meta\ogg_opus.c" />
     <ClCompile Include="meta\ogg_vorbis.c" />
     <ClCompile Include="meta\ogl.c" />

src/libvgmstream.vcxproj.filters

@@ -1096,9 +1096,6 @@
     <ClCompile Include="meta\fda.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\fdk_nxopus.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ffdl.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1429,6 +1426,9 @@
     <ClCompile Include="meta\nxap.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\nxof.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ogg_opus.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -625,7 +625,6 @@ VGMSTREAM* init_vgmstream_opus_opusnx(STREAMFILE* sf);
 VGMSTREAM* init_vgmstream_opus_nsopus(STREAMFILE* sf);
 VGMSTREAM* init_vgmstream_opus_sqex(STREAMFILE* sf);
 VGMSTREAM* init_vgmstream_opus_rsnd(STREAMFILE* sf);
-VGMSTREAM* init_vgmstream_opus_fdk(STREAMFILE* sf);
 
 VGMSTREAM * init_vgmstream_pc_ast(STREAMFILE * streamFile);
 
@@ -983,4 +982,6 @@ VGMSTREAM* init_vgmstream_squeaksample(STREAMFILE* sf);
 
 VGMSTREAM* init_vgmstream_snds(STREAMFILE* sf);
 
+VGMSTREAM* init_vgmstream_nxof(STREAMFILE* sf);
+
 #endif /*_META_H*/

src/meta/nxof.c

@@ -2,7 +2,7 @@
 #include "../coding/coding.h"
 
 /* Nihon Falcom FDK NXOpus  [Ys X -NORDICS- (Switch)] */
-VGMSTREAM* init_vgmstream_opus_fdk(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_nxof(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     off_t start_offset;
     int loop_flag, channels, sample_rate;
@@ -28,13 +28,14 @@ VGMSTREAM* init_vgmstream_opus_fdk(STREAMFILE* sf) {
     vgmstream = allocate_vgmstream(channels, loop_flag);
     if (!vgmstream) goto fail;
 
-    vgmstream->meta_type = meta_FDK_NXOPUS;
+    vgmstream->meta_type = meta_NXOF;
     vgmstream->sample_rate = sample_rate;
     vgmstream->num_samples = num_samples;
     vgmstream->loop_start_sample = loop_start;
     vgmstream->loop_end_sample = loop_end;
 
 #ifdef VGM_USE_FFMPEG
+    skip = switch_opus_get_encoder_delay(start_offset, sf);
     vgmstream->codec_data = init_ffmpeg_switch_opus(sf, start_offset, data_size, vgmstream->channels, skip, vgmstream->sample_rate);
     if (!vgmstream->codec_data) goto fail;
     vgmstream->coding_type = coding_FFmpeg;

src/vgmstream.c

@@ -309,7 +309,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_opus_nus3,
     init_vgmstream_opus_sps_n1,
     init_vgmstream_opus_nxa,
-    init_vgmstream_opus_fdk,
     init_vgmstream_pc_ast,
     init_vgmstream_naac,
     init_vgmstream_ubi_sb,
@@ -522,6 +521,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_squeaksample,
     init_vgmstream_snds,
     init_vgmstream_adm2,
+    init_vgmstream_nxof,
 
     /* lower priority metas (no clean header identity, somewhat ambiguous, or need extension/companion file to identify) */
     init_vgmstream_scd_pcm,

src/vgmstream_types.h

@@ -702,7 +702,7 @@ typedef enum {
     meta_SQUEAKSTREAM,
     meta_SQUEAKSAMPLE,
     meta_SNDS,
-    meta_FDK_NXOPUS,
+    meta_NXOF,
 
 } meta_t;