projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change ffmpeg buffer strategy, reactivate 'new' dialog
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
bdwrite.C
diff --git
a/cinelerra-5.1/cinelerra/bdwrite.C
b/cinelerra-5.1/cinelerra/bdwrite.C
index a26d56aa796f416fbb037090e6dc10446c96b70d..6d25a52a3e747d1b91788693975984ebb61403d0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/bdwrite.C
+++ b/
cinelerra-5.1/cinelerra/bdwrite.C
@@
-135,7
+135,7
@@
enum {
BLURAY_AUDIO_FORMAT_MONO = 1,
BLURAY_AUDIO_FORMAT_STEREO = 3,
BLURAY_AUDIO_FORMAT_MULTI_CHAN = 6,
BLURAY_AUDIO_FORMAT_MONO = 1,
BLURAY_AUDIO_FORMAT_STEREO = 3,
BLURAY_AUDIO_FORMAT_MULTI_CHAN = 6,
- BLURAY_AUDIO_FORMAT_COMBO = 12, // Stereo ac3/dts,
+ BLURAY_AUDIO_FORMAT_COMBO = 12, // Stereo ac3/dts,
BLURAY_AUDIO_RATE_48 = 1,
BLURAY_AUDIO_RATE_96 = 4,
BLURAY_AUDIO_RATE_48 = 1,
BLURAY_AUDIO_RATE_96 = 4,
@@
-1345,7
+1345,7
@@
pb_obj::set_bdj(char *nm, int pt)
bdj_name = cstrdup(nm);
}
bdj_name = cstrdup(nm);
}
-void
+void
pb_obj::write_hdmv_obj(int id_ref)
{
bs.write(pb_typ, 2);
pb_obj::write_hdmv_obj(int id_ref)
{
bs.write(pb_typ, 2);
@@
-2427,7
+2427,7
@@
static int bd_video_format(int w, int h, int ilace)
if( w == 720 && h == 480 && ilace ) return BLURAY_VIDEO_FORMAT_480I;
if( w == 720 && h == 576 && ilace ) return BLURAY_VIDEO_FORMAT_576I;
if( w == 720 && h == 480 && !ilace ) return BLURAY_VIDEO_FORMAT_480P;
if( w == 720 && h == 480 && ilace ) return BLURAY_VIDEO_FORMAT_480I;
if( w == 720 && h == 576 && ilace ) return BLURAY_VIDEO_FORMAT_576I;
if( w == 720 && h == 480 && !ilace ) return BLURAY_VIDEO_FORMAT_480P;
- if( w == 1
92
0 && h == 1080 && ilace ) return BLURAY_VIDEO_FORMAT_1080I;
+ if( w == 1
44
0 && h == 1080 && ilace ) return BLURAY_VIDEO_FORMAT_1080I;
if( w == 1280 && h == 720 && !ilace ) return BLURAY_VIDEO_FORMAT_720P;
if( w == 1920 && h == 1080 && !ilace ) return BLURAY_VIDEO_FORMAT_1080P;
if( w == 720 && h == 576 && !ilace ) return BLURAY_VIDEO_FORMAT_576P;
if( w == 1280 && h == 720 && !ilace ) return BLURAY_VIDEO_FORMAT_720P;
if( w == 1920 && h == 1080 && !ilace ) return BLURAY_VIDEO_FORMAT_1080P;
if( w == 720 && h == 576 && !ilace ) return BLURAY_VIDEO_FORMAT_576P;
@@
-2453,7
+2453,7
@@
static int bd_aspect_ratio(int w, int h, double ratio)
double aspect = (w * ratio) / h;
if( fabs(aspect-1.333) < 0.01 ) return BLURAY_ASPECT_RATIO_4_3;
if( fabs(aspect-1.777) < 0.01 ) return BLURAY_ASPECT_RATIO_16_9;
double aspect = (w * ratio) / h;
if( fabs(aspect-1.333) < 0.01 ) return BLURAY_ASPECT_RATIO_4_3;
if( fabs(aspect-1.777) < 0.01 ) return BLURAY_ASPECT_RATIO_16_9;
- return w == 720 ? BLURAY_ASPECT_RATIO_4_3 : BLURAY_ASPECT_RATIO_16_9;
+ return w == 720 ? BLURAY_ASPECT_RATIO_4_3 : BLURAY_ASPECT_RATIO_16_9;
fprintf(stderr, "unknown bluray aspect ratio %5.3f\n",aspect);
exit(1);
}
fprintf(stderr, "unknown bluray aspect ratio %5.3f\n",aspect);
exit(1);
}
@@
-2676,7
+2676,7
@@
Media::compose()
mp->cmds.append(cmd);
mov.movies.append(mp); // BREAK
mp->cmds.append(cmd);
mov.movies.append(mp); // BREAK
-
+
for( int ii=0; ii<size(); ++ii ) {
mp = new movie_obj();
mp->resume_intention_flag = 1;
for( int ii=0; ii<size(); ++ii ) {
mp = new movie_obj();
mp->resume_intention_flag = 1;