Skip to content

Change FFmpegChapter#id type to long #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramp merged 1 commit into from
Mar 10, 2024
Merged

Change FFmpegChapter#id type to long #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/bramp/ffmpeg/probe/FFmpegChapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
justification = "POJO objects where the fields are populated by gson")
public class FFmpegChapter {

public int id;
public long id;
public String time_base;
public long start;
public String start_time;
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/net/bramp/ffmpeg/FFprobeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public void before() throws IOException {
when(runFunc.run(argThatHasItem(Samples.side_data_list)))
.thenAnswer(new NewProcessAnswer("ffprobe-side_data_list"));

when(runFunc.run(argThatHasItem(Samples.chapters_with_long_id)))
.thenAnswer(new NewProcessAnswer("chapters_with_long_id.m4b"));

ffprobe = new FFprobe(runFunc);
}

Expand Down Expand Up @@ -160,4 +163,12 @@ public void testProbeSideDataList() throws IOException {
"\n00000000: 0 -65536 0\n00000001: 65536 0 0\n00000002: 0 0 1073741824\n"));
assertThat(info.getStreams().get(0).side_data_list[0].rotation, is(90));
}

@Test
public void testChaptersWithLongIds() throws IOException {
FFmpegProbeResult info = ffprobe.probe(Samples.chapters_with_long_id);

assertThat(info.getChapters().get(0).id, is(6613449456311024506L));
assertThat(info.getChapters().get(1).id, is(-4433436293284298339L));
}
Copy link
Copy Markdown
Owner

@bramp bramp Mar 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are chapter IDs allowed to be negative?

Copy link
Copy Markdown
Collaborator Author

@Euklios Euklios Mar 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good question, I just checked in the ffmpeg source.
They use int64_t, which is 64bit signed, so type long and negative values are supported.

I'm not sure, if ffmpeg itself will produce negative numbers, might be compatibility with other software.

Edit:
FFmpeg AVChapter

}
2 changes: 2 additions & 0 deletions src/test/java/net/bramp/ffmpeg/fixtures/Samples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ private Samples() {

public static final String divide_by_zero = FAKE_PREFIX + "Divide By Zero.mp4";

public static final String chapters_with_long_id = FAKE_PREFIX + "chapters_with_long_id.m4b";

// TODO Change to a temp directory
// TODO Generate random names, so we can run tests concurrently
public static final String output_mp4 = "output.mp4";
Expand Down
134 changes: 134 additions & 0 deletions src/test/resources/net/bramp/ffmpeg/fixtures/chapters_with_long_id.m4b
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"streams": [
{
"index": 0,
"codec_name": "aac",
"codec_long_name": "AAC (Advanced Audio Coding)",
"profile": "LC",
"codec_type": "audio",
"codec_time_base": "1/44100",
"codec_tag_string": "mp4a",
"codec_tag": "0x6134706d",
"sample_fmt": "fltp",
"sample_rate": "44100",
"channels": 1,
"channel_layout": "mono",
"bits_per_sample": 0,
"r_frame_rate": "0/0",
"avg_frame_rate": "0/0",
"time_base": "1/44100",
"start_pts": 0,
"start_time": "0.000000",
"duration_ts": 248628224,
"duration": "5637.828209",
"bit_rate": "62993",
"max_bit_rate": "75648",
"nb_frames": "242801",
"disposition": {
"default": 1,
"dub": 0,
"original": 0,
"comment": 0,
"lyrics": 0,
"karaoke": 0,
"forced": 0,
"hearing_impaired": 0,
"visual_impaired": 0,
"clean_effects": 0,
"attached_pic": 0,
"timed_thumbnails": 0
},
"tags": {
"creation_time": "2016-02-21T08:27:56.000000Z",
"language": "und"
}
},
{
"index": 1,
"codec_name": "bin_data",
"codec_long_name": "binary data",
"codec_type": "data",
"codec_tag_string": "text",
"codec_tag": "0x74786574",
"r_frame_rate": "0/0",
"avg_frame_rate": "0/0",
"time_base": "1/44100",
"start_pts": 0,
"start_time": "0.000000",
"duration_ts": 248628224,
"duration": "5637.828209",
"bit_rate": "1",
"nb_frames": "24",
"disposition": {
"default": 0,
"dub": 0,
"original": 0,
"comment": 0,
"lyrics": 0,
"karaoke": 0,
"forced": 0,
"hearing_impaired": 0,
"visual_impaired": 0,
"clean_effects": 0,
"attached_pic": 0,
"timed_thumbnails": 0
},
"tags": {
"creation_time": "2016-02-21T08:28:13.000000Z",
"language": "und"
}
}
],
"chapters": [
{
"id": 6613449456311024506,
"time_base": "1/1000000000",
"start": 0,
"start_time": "0.000000",
"end": 435458000000,
"end_time": "435.458000",
"tags": {
"title": "Chapitre 01"
}
},
{
"id": -4433436293284298339,
"time_base": "1/1000000000",
"start": 435458000000,
"start_time": "435.458000",
"end": 852333000000,
"end_time": "852.333000",
"tags": {
"title": "Chapitre 02"
}
}
],
"format": {
"filename": "sammyjay_1602_librivox.m4b",
"nb_streams": 2,
"nb_programs": 0,
"format_name": "mov,mp4,m4a,3gp,3g2,mj2",
"format_long_name": "QuickTime / MOV",
"start_time": "0.000000",
"duration": "5637.828209",
"size": "45417172",
"bit_rate": "64446",
"probe_score": 100,
"tags": {
"major_brand": "M4A",
"minor_version": "0",
"compatible_brands": "3gp5isom",
"creation_time": "2016-02-21T08:27:56.000000Z",
"genre": "Audiobook",
"media_type": "2",
"encoder": "Chapter and Verse V 1.5",
"title": "The Adventures of Sammy Jay",
"artist": "Thornton W. Burgess",
"album": "The Adventures of Sammy Jay",
"comment": "https://archive.org/details/sammyjay_1602_librivox",
"copyright": "PD1.0",
"track": "1",
"Encoding Params": "vers"
}
}
}