diff --git a/.gitignore b/.gitignore index f577f31..312d407 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,44 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml +*.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template # Built application files *.apk *.ap_ - -# Files for the ART/Dalvik VM +/build +/captures +.externalNativeBuild +/.externalNativeBuild +# Files for the Dalvik VM *.dex # Java class files @@ -11,13 +47,9 @@ # Generated files bin/ gen/ -out/ # Gradle files .gradle/ -build/ -.idea/ - # Local configuration file (sdk path, etc) local.properties @@ -28,21 +60,59 @@ proguard/ # Log Files *.log -# Android Studio Navigation editor temp files -.navigation/ -# Android Studio captures folder -captures/ +### Java template +*.class -# Intellij -*.iml -.idea/workspace.xml +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath +/build +/captures +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject -# Keystore files -*.jks +# PDT-specific +.buildpath -gradlew +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml -gradlew +# Keep external libs +!app/libs/*.jar -SmallVideoRecord2/copy.sh +# script output +check-dpi.txt* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7d2b524 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "SmallVideoRecord1"] + path = SmallVideoRecord1 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord1.git +[submodule "SmallVideoRecord2"] + path = SmallVideoRecord2 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord2.git diff --git a/SmallVideoRecord1/.gitignore b/SmallVideoRecord1/.gitignore index f577f31..3c5b5c1 100644 --- a/SmallVideoRecord1/.gitignore +++ b/SmallVideoRecord1/.gitignore @@ -1,8 +1,42 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml +*.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template # Built application files *.apk *.ap_ - -# Files for the ART/Dalvik VM +/build +/captures +# Files for the Dalvik VM *.dex # Java class files @@ -11,13 +45,9 @@ # Generated files bin/ gen/ -out/ # Gradle files .gradle/ -build/ -.idea/ - # Local configuration file (sdk path, etc) local.properties @@ -28,21 +58,59 @@ proguard/ # Log Files *.log -# Android Studio Navigation editor temp files -.navigation/ -# Android Studio captures folder -captures/ +### Java template +*.class -# Intellij -*.iml -.idea/workspace.xml +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath +/build +/captures +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject -# Keystore files -*.jks +# PDT-specific +.buildpath -gradlew +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml -gradlew +# Keep external libs +!app/libs/*.jar -SmallVideoRecord2/copy.sh +# script output +check-dpi.txt* diff --git a/SmallVideoRecord1/SmallVideoLib/.gitignore b/SmallVideoRecord1/SmallVideoLib/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/SmallVideoRecord1/SmallVideoLib/.gitignore @@ -0,0 +1 @@ +/build diff --git a/SmallVideoRecord1/SmallVideoLib/build.gradle b/SmallVideoRecord1/SmallVideoLib/build.gradle index 45cb2b1..de66816 100644 --- a/SmallVideoRecord1/SmallVideoLib/build.gradle +++ b/SmallVideoRecord1/SmallVideoLib/build.gradle @@ -2,12 +2,14 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 22 - buildToolsVersion "23.0.3" - + compileSdkVersion 28 + buildToolsVersion "29.0.1" + lintOptions { + abortOnError false + } defaultConfig { minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 28 versionCode 14 versionName "1.2.2" } @@ -18,12 +20,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - lintOptions { - abortOnError false - } publish { - userOrg = 'mabeijianxi'//bintray.com用户名 groupId = 'com.mabeijianxi'//jcenter上的路径 artifactId = 'small-video-record'//项目名称 @@ -32,3 +30,12 @@ android { website = 'https://github.com/mabeijianxi/small-video-record'//网站，不重要 } } + +dependencies { + testImplementation 'junit:junit:4.12' + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + + implementation fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro b/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro new file mode 100644 index 0000000..b5fa7ec --- /dev/null +++ b/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/macdidi5/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/SmallVideoRecord1/build.gradle b/SmallVideoRecord1/build.gradle index f2b1a2c..59ad1da 100644 --- a/SmallVideoRecord1/build.gradle +++ b/SmallVideoRecord1/build.gradle @@ -2,11 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - classpath 'com.novoda:bintray-release:0.3.4' + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } @@ -21,4 +23,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } -tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false \ No newline at end of file +//tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false \ No newline at end of file diff --git a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372ae..0000000 Binary files a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties index 122a0dc..d9be5aa 100644 --- a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties +++ b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed May 31 15:40:00 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/SmallVideoRecord1/sample/build.gradle b/SmallVideoRecord1/sample/build.gradle index e909c19..d9d3452 100644 --- a/SmallVideoRecord1/sample/build.gradle +++ b/SmallVideoRecord1/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "29.0.1" defaultConfig { applicationId "com.mabeijianxi.smallvideo" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 28 versionCode 14 versionName "1.2.2" } @@ -24,8 +24,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:22.2.1' - compile project(':SmallVideoLib') + testImplementation 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation project(':SmallVideoLib') } diff --git a/SmallVideoRecord2/.gitignore b/SmallVideoRecord2/.gitignore index 39fb081..3c5b5c1 100644 --- a/SmallVideoRecord2/.gitignore +++ b/SmallVideoRecord2/.gitignore @@ -1,9 +1,116 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml *.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template +# Built application files +*.apk +*.ap_ +/build +/captures +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + + +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata .gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath /build /captures -.externalNativeBuild +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml + +# Keep external libs +!app/libs/*.jar + +# script output +check-dpi.txt* diff --git a/SmallVideoRecord2/SmallVideoLib2/build.gradle b/SmallVideoRecord2/SmallVideoLib2/build.gradle index 1779ebe..3366474 100644 --- a/SmallVideoRecord2/SmallVideoLib2/build.gradle +++ b/SmallVideoRecord2/SmallVideoLib2/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion '29.0.0' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 11 versionName "2.0.3" externalNativeBuild { @@ -14,8 +14,9 @@ android { cppFlags "-std=c++11" } } - ndk{ - abiFilters "armeabi","armeabi-v7a","arm64-v8a","x86","x86_64" + ndk { +// abiFilters "armeabi","armeabi-v7a","arm64-v8a","x86","x86_64" + abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } } buildTypes { @@ -32,9 +33,7 @@ android { path "CMakeLists.txt" } } - publish { - userOrg = 'mabeijianxi'//bintray.com用户名 groupId = 'com.mabeijianxi'//jcenter上的路径 artifactId = 'small-video-record2'//项目名称 @@ -45,5 +44,5 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/android/armv7-a-vfp/lib/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/plan9/head b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/plan9/head old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/plan9/printf b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/plan9/printf old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/solaris/make_sunver.pl b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/solaris/make_sunver.pl old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/windows/makedef b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/windows/makedef old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/windows/mslink b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/compat/windows/mslink old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/configure b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/configure old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/doc/doxy-wrapper.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/doc/doxy-wrapper.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/doc/print_options b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/doc/print_options old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/jianxi_ffmpeg_android.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/jianxi_ffmpeg_android.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so deleted file mode 120000 index a6283fe..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so +++ /dev/null @@ -1 +0,0 @@ -libavcodec.so.57 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so new file mode 100644 index 0000000..a6283fe --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so @@ -0,0 +1 @@ +libavcodec.so.57 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so.57 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavcodec/libavcodec.so.57 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so deleted file mode 120000 index cd49036..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so +++ /dev/null @@ -1 +0,0 @@ -libavfilter.so.6 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so new file mode 100644 index 0000000..cd49036 --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so @@ -0,0 +1 @@ +libavfilter.so.6 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so.6 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavfilter/libavfilter.so.6 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so deleted file mode 120000 index 74314fc..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so +++ /dev/null @@ -1 +0,0 @@ -libavformat.so.57 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so new file mode 100644 index 0000000..74314fc --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so @@ -0,0 +1 @@ +libavformat.so.57 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so.57 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavformat/libavformat.so.57 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so deleted file mode 120000 index e680d48..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so +++ /dev/null @@ -1 +0,0 @@ -libavutil.so.55 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so new file mode 100644 index 0000000..e680d48 --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so @@ -0,0 +1 @@ +libavutil.so.55 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so.55 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libavutil/libavutil.so.55 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so deleted file mode 120000 index f0960fa..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so +++ /dev/null @@ -1 +0,0 @@ -libswresample.so.2 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so new file mode 100644 index 0000000..f0960fa --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so @@ -0,0 +1 @@ +libswresample.so.2 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so.2 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswresample/libswresample.so.2 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so deleted file mode 120000 index a92c953..0000000 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so +++ /dev/null @@ -1 +0,0 @@ -libswscale.so.4 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so new file mode 100644 index 0000000..a92c953 --- /dev/null +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so @@ -0,0 +1 @@ +libswscale.so.4 \ No newline at end of file diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so.4 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/libswscale/libswscale.so.4 old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/copycooker.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/copycooker.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate-run.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate-run.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate/source-check.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/fate/source-check.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ffserver-regression.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ffserver-regression.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/lavf-regression.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/lavf-regression.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-aqtitle b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-aqtitle index 87253c9..417779b 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-aqtitle +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-aqtitle @@ -1,45 +1,45 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:03:29.92,0:03:31.28,Default,,0,0,0,,Dougu? -Dialogue: 0,0:03:33.36,0:03:35.76,Default,,0,0,0,,Zlato, jseš v pořádku? -Dialogue: 0,0:03:37.72,0:03:39.12,Default,,0,0,0,,Měl jsi sny. -Dialogue: 0,0:03:41.44,0:03:43.32,Default,,0,0,0,,Byly o Marsu? -Dialogue: 0,0:03:48.92,0:03:50.52,Default,,0,0,0,,Je to lepší? -Dialogue: 0,0:03:53.12,0:03:54.72,Default,,0,0,0,,Chudinko moje. -Dialogue: 0,0:03:55.76,0:03:58.08,Default,,0,0,0,,Začíná to být\Nposedlost. -Dialogue: 0,0:04:05.92,0:04:07.16,Default,,0,0,0,,Byla tam i ona? -Dialogue: 0,0:04:09.12,0:04:10.48,Default,,0,0,0,,Kdo? -Dialogue: 0,0:04:12.44,0:04:15.16,Default,,0,0,0,,Ta, o které jsi mi vyprávěl.\NTa bruneta. -Dialogue: 0,0:04:16.32,0:04:17.52,Default,,0,0,0,,Lori. -Dialogue: 0,0:04:20.32,0:04:23.16,Default,,0,0,0,,Nemůžu uvěřit\Nže žárlíš na sen. -Dialogue: 0,0:04:23.84,0:04:26.60,Default,,0,0,0,,- Kdo je ona?\N- Nikdo. -Dialogue: 0,0:04:26.60,0:04:28.80,Default,,0,0,0,,"Nikdo"? Jak se jmenuje? -Dialogue: 0,0:04:28.80,0:04:30.24,Default,,0,0,0,,Nevím. -Dialogue: 0,0:04:31.52,0:04:33.20,Default,,0,0,0,,- Pověz!\N- Nevím! -Dialogue: 0,0:04:33.20,0:04:35.48,Default,,0,0,0,,Radši bys mi to měl říct! -Dialogue: 0,0:04:35.48,0:04:39.16,Default,,0,0,0,,To není legrace Dougu.\NZdá se ti o ní každou noc. -Dialogue: 0,0:04:39.16,0:04:41.84,Default,,0,0,0,,Ale vždy se ráno probudím. -Dialogue: 0,0:04:41.84,0:04:43.28,Default,,0,0,0,,Nech mě být! -Dialogue: 0,0:04:45.72,0:04:47.76,Default,,0,0,0,,No tak, zlato. -Dialogue: 0,0:04:47.76,0:04:50.72,Default,,0,0,0,,Ty víš, že jsi dívkou\Nmých snů. -Dialogue: 0,0:04:50.72,0:04:52.40,Default,,0,0,0,,Myslíš to vážně? -Dialogue: 0,0:04:53.48,0:04:55.32,Default,,0,0,0,,To víš že ano. -Dialogue: 0,0:05:04.40,0:05:07.20,Default,,0,0,0,,Dám ti něco\No čem budeš snít. -Dialogue: 0,0:05:16.76,0:05:16.92,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných... -Dialogue: 0,0:05:16.92,0:05:20.36,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných... -Dialogue: 0,0:05:20.36,0:05:24.36,Default,,0,0,0,,jsou naše jediná obrana proti\Npočetní převaze z jižního bloku. -Dialogue: 0,0:05:24.36,0:05:26.76,Default,,0,0,0,,A další násilí na Marsu... -Dialogue: 0,0:05:26.76,1:44:16.00,Default,,0,0,0,,[...] -Dialogue: 0,1:44:16.00,1:44:17.60,Default,,0,0,0,,Co se děje? -Dialogue: 0,1:44:17.60,1:44:21.28,Default,,0,0,0,,Měl jsem jenom hroznou představu.\NCo když tohle je jenom sen? -Dialogue: 0,1:44:22.76,1:44:25.68,Default,,0,0,0,,Tak mi dej ryhcle pusu\Nnež se probudíš. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:03:29.92,0:03:31.28,Default,,0,0,0,,Dougu? +Dialogue: 0,0:03:33.36,0:03:35.76,Default,,0,0,0,,Zlato, jseš v pořádku? +Dialogue: 0,0:03:37.72,0:03:39.12,Default,,0,0,0,,Měl jsi sny. +Dialogue: 0,0:03:41.44,0:03:43.32,Default,,0,0,0,,Byly o Marsu? +Dialogue: 0,0:03:48.92,0:03:50.52,Default,,0,0,0,,Je to lepší? +Dialogue: 0,0:03:53.12,0:03:54.72,Default,,0,0,0,,Chudinko moje. +Dialogue: 0,0:03:55.76,0:03:58.08,Default,,0,0,0,,Začíná to být\Nposedlost. +Dialogue: 0,0:04:05.92,0:04:07.16,Default,,0,0,0,,Byla tam i ona? +Dialogue: 0,0:04:09.12,0:04:10.48,Default,,0,0,0,,Kdo? +Dialogue: 0,0:04:12.44,0:04:15.16,Default,,0,0,0,,Ta, o které jsi mi vyprávěl.\NTa bruneta. +Dialogue: 0,0:04:16.32,0:04:17.52,Default,,0,0,0,,Lori. +Dialogue: 0,0:04:20.32,0:04:23.16,Default,,0,0,0,,Nemůžu uvěřit\Nže žárlíš na sen. +Dialogue: 0,0:04:23.84,0:04:26.60,Default,,0,0,0,,- Kdo je ona?\N- Nikdo. +Dialogue: 0,0:04:26.60,0:04:28.80,Default,,0,0,0,,"Nikdo"? Jak se jmenuje? +Dialogue: 0,0:04:28.80,0:04:30.24,Default,,0,0,0,,Nevím. +Dialogue: 0,0:04:31.52,0:04:33.20,Default,,0,0,0,,- Pověz!\N- Nevím! +Dialogue: 0,0:04:33.20,0:04:35.48,Default,,0,0,0,,Radši bys mi to měl říct! +Dialogue: 0,0:04:35.48,0:04:39.16,Default,,0,0,0,,To není legrace Dougu.\NZdá se ti o ní každou noc. +Dialogue: 0,0:04:39.16,0:04:41.84,Default,,0,0,0,,Ale vždy se ráno probudím. +Dialogue: 0,0:04:41.84,0:04:43.28,Default,,0,0,0,,Nech mě být! +Dialogue: 0,0:04:45.72,0:04:47.76,Default,,0,0,0,,No tak, zlato. +Dialogue: 0,0:04:47.76,0:04:50.72,Default,,0,0,0,,Ty víš, že jsi dívkou\Nmých snů. +Dialogue: 0,0:04:50.72,0:04:52.40,Default,,0,0,0,,Myslíš to vážně? +Dialogue: 0,0:04:53.48,0:04:55.32,Default,,0,0,0,,To víš že ano. +Dialogue: 0,0:05:04.40,0:05:07.20,Default,,0,0,0,,Dám ti něco\No čem budeš snít. +Dialogue: 0,0:05:16.76,0:05:16.92,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných... +Dialogue: 0,0:05:16.92,0:05:20.36,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných... +Dialogue: 0,0:05:20.36,0:05:24.36,Default,,0,0,0,,jsou naše jediná obrana proti\Npočetní převaze z jižního bloku. +Dialogue: 0,0:05:24.36,0:05:26.76,Default,,0,0,0,,A další násilí na Marsu... +Dialogue: 0,0:05:26.76,1:44:16.00,Default,,0,0,0,,[...] +Dialogue: 0,1:44:16.00,1:44:17.60,Default,,0,0,0,,Co se děje? +Dialogue: 0,1:44:17.60,1:44:21.28,Default,,0,0,0,,Měl jsem jenom hroznou představu.\NCo když tohle je jenom sen? +Dialogue: 0,1:44:22.76,1:44:25.68,Default,,0,0,0,,Tak mi dej ryhcle pusu\Nnež se probudíš. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ass-to-ass-transcode b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ass-to-ass-transcode index bfc4e95..a3a2400 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ass-to-ass-transcode +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ass-to-ass-transcode @@ -1,62 +1,62 @@ -[Script Info] -; Script generated by Aegisub 3.2.2 -; http://www.aegisub.org/ -Title: Default Aegisub file -ScriptType: v4.00+ -WrapStyle: 0 -PlayResX: 1280 -PlayResY: 720 -ScaledBorderAndShadow: yes -Video Zoom: 4 -Video Colorspace: BT.601 -Video Aspect Ratio: c1.77778 -YCbCr Matrix: TV.709 - -[Aegisub Project Garbage] -Automation Scripts: ~../../../../Aegisub autoload folder/New Folder/cmconv.lua -Last Style Storage: Default1 -Audio File: kamisama05-premux.mkv -Video File: kamisama05-premux.mkv -Keyframes File: ../Desktop/Keyframe Raws/kamisama05-wr.keyframes.txt -Video AR Mode: 4 -Video AR Value: 1.777778 -Video Zoom Percent: 0.875000 -Video Position: 306 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,110,110,40,0 -Style: Default2,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,60,60,40,0 -Style: Default - Alt,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A673308,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,8,110,110,40,0 -Style: OP2-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1 -Style: OP1-Eng-furigana,Chinacat,20,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,2.5,0.05,2,40,40,30,1 -Style: OP1-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1 -Style: OP1-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1 -Style: OP1-Eng,Chinacat,39,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,5,0.1,2,40,40,30,1 -Style: OP2-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1 -Style: ED1-Romaji,Agency FB,44,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,3,0,7,40,40,30,1 -Style: ED1-Eng,ClaudeSansPlain,40,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,4,0,3,40,40,30,1 -Style: ED1-Eng-furigana,ClaudeSansPlain,20,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,2,0,3,40,40,30,1 -Style: ED1-Romaji-furigana,Agency FB,22,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,1.5,0,7,40,40,30,1 -Style: Signs,Arial,46,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,0,0,5,10,10,10,1 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 3,0:00:12.74,0:00:13.49,OP1-Romaji,,0,0,0,fx,{\an5\pos(352,54)\move(352,-101,352,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i -Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(365,54)\move(365,-101,365,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t -Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(383,54)\move(383,-101,383,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t -Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(402,54)\move(402,-101,402,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}a -Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(416,54)\move(416,-101,416,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i -Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(438,54)\move(438,-101,438,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}k -Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(455,54)\move(455,-101,455,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}o -Dialogue: 10,0:23:52.82,0:23:54.80,Default,,0,0,100,,Wing Fling Hazard! - - -[Aegisub Extradata] -Data: 5,a-mo,e{"uuid"#3A"3386f06e-e9b4-40e2-8412-3fb75759e716"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(241.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} -Data: 6,a-mo,e{"uuid"#3A"599d1dca-62d7-4732-9983-729119494e29"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(251.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} -Data: 7,a-mo,e{"uuid"#3A"6f1637e2-25f1-44e5-98d8-0e63a7b72c10"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(246.27#2C435.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} -Data: 8,a-mo,e{"uuid"#3A"4d9840e0-62db-4bb4-b6a3-87f376a9009c"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.7\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord3.2\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"} -Data: 9,a-mo,e{"uuid"#3A"65a47c5f-8cc5-403f-9b1d-fb1912311891"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur1\\c&H8FE2CF&\\fneveryone\\b1\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord0\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"} - - +[Script Info] +; Script generated by Aegisub 3.2.2 +; http://www.aegisub.org/ +Title: Default Aegisub file +ScriptType: v4.00+ +WrapStyle: 0 +PlayResX: 1280 +PlayResY: 720 +ScaledBorderAndShadow: yes +Video Zoom: 4 +Video Colorspace: BT.601 +Video Aspect Ratio: c1.77778 +YCbCr Matrix: TV.709 + +[Aegisub Project Garbage] +Automation Scripts: ~../../../../Aegisub autoload folder/New Folder/cmconv.lua +Last Style Storage: Default1 +Audio File: kamisama05-premux.mkv +Video File: kamisama05-premux.mkv +Keyframes File: ../Desktop/Keyframe Raws/kamisama05-wr.keyframes.txt +Video AR Mode: 4 +Video AR Value: 1.777778 +Video Zoom Percent: 0.875000 +Video Position: 306 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,110,110,40,0 +Style: Default2,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,60,60,40,0 +Style: Default - Alt,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A673308,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,8,110,110,40,0 +Style: OP2-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1 +Style: OP1-Eng-furigana,Chinacat,20,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,2.5,0.05,2,40,40,30,1 +Style: OP1-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1 +Style: OP1-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1 +Style: OP1-Eng,Chinacat,39,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,5,0.1,2,40,40,30,1 +Style: OP2-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1 +Style: ED1-Romaji,Agency FB,44,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,3,0,7,40,40,30,1 +Style: ED1-Eng,ClaudeSansPlain,40,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,4,0,3,40,40,30,1 +Style: ED1-Eng-furigana,ClaudeSansPlain,20,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,2,0,3,40,40,30,1 +Style: ED1-Romaji-furigana,Agency FB,22,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,1.5,0,7,40,40,30,1 +Style: Signs,Arial,46,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,0,0,5,10,10,10,1 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 3,0:00:12.74,0:00:13.49,OP1-Romaji,,0,0,0,fx,{\an5\pos(352,54)\move(352,-101,352,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i +Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(365,54)\move(365,-101,365,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t +Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(383,54)\move(383,-101,383,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t +Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(402,54)\move(402,-101,402,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}a +Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(416,54)\move(416,-101,416,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i +Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(438,54)\move(438,-101,438,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}k +Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(455,54)\move(455,-101,455,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}o +Dialogue: 10,0:23:52.82,0:23:54.80,Default,,0,0,100,,Wing Fling Hazard! + + +[Aegisub Extradata] +Data: 5,a-mo,e{"uuid"#3A"3386f06e-e9b4-40e2-8412-3fb75759e716"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(241.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} +Data: 6,a-mo,e{"uuid"#3A"599d1dca-62d7-4732-9983-729119494e29"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(251.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} +Data: 7,a-mo,e{"uuid"#3A"6f1637e2-25f1-44e5-98d8-0e63a7b72c10"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(246.27#2C435.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"} +Data: 8,a-mo,e{"uuid"#3A"4d9840e0-62db-4bb4-b6a3-87f376a9009c"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.7\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord3.2\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"} +Data: 9,a-mo,e{"uuid"#3A"65a47c5f-8cc5-403f-9b1d-fb1912311891"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur1\\c&H8FE2CF&\\fneveryone\\b1\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord0\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"} + + diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc index 4cc02d1..e70d2f2 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc @@ -1,14 +1,14 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} ) -Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} ) +Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc-realtime b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc-realtime index be800a4..abddfa7 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc-realtime +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-cc-realtime @@ -1,42 +1,42 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:14.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}( -Dialogue: 0,0:00:15.47,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} in -Dialogue: 0,0:00:15.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inau -Dialogue: 0,0:00:16.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudi -Dialogue: 0,0:00:16.81,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudibl -Dialogue: 0,0:00:17.25,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible -Dialogue: 0,0:00:17.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible ra -Dialogue: 0,0:00:18.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radi -Dialogue: 0,0:00:18.59,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio -Dialogue: 0,0:00:19.03,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio ch -Dialogue: 0,0:00:19.48,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chat -Dialogue: 0,0:00:19.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatte -Dialogue: 0,0:00:20.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter -Dialogue: 0,0:00:21.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} ) -Dialogue: 0,0:00:42.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> -Dialogue: 0,0:00:43.05,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> S -Dialogue: 0,0:00:43.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Saf -Dialogue: 0,0:00:43.94,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safet -Dialogue: 0,0:00:44.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety -Dialogue: 0,0:00:44.83,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety re -Dialogue: 0,0:00:45.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety rema -Dialogue: 0,0:00:45.72,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remain -Dialogue: 0,0:00:46.17,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains -Dialogue: 0,0:00:46.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains ou -Dialogue: 0,0:00:47.06,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our -Dialogue: 0,0:00:47.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our nu -Dialogue: 0,0:00:47.95,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our numb -Dialogue: 0,0:00:48.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number -Dialogue: 0,0:00:48.84,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number o -Dialogue: 0,0:00:49.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:14.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}( +Dialogue: 0,0:00:15.47,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} in +Dialogue: 0,0:00:15.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inau +Dialogue: 0,0:00:16.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudi +Dialogue: 0,0:00:16.81,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudibl +Dialogue: 0,0:00:17.25,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible +Dialogue: 0,0:00:17.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible ra +Dialogue: 0,0:00:18.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radi +Dialogue: 0,0:00:18.59,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio +Dialogue: 0,0:00:19.03,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio ch +Dialogue: 0,0:00:19.48,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chat +Dialogue: 0,0:00:19.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatte +Dialogue: 0,0:00:20.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter +Dialogue: 0,0:00:21.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} ) +Dialogue: 0,0:00:42.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> +Dialogue: 0,0:00:43.05,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> S +Dialogue: 0,0:00:43.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Saf +Dialogue: 0,0:00:43.94,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safet +Dialogue: 0,0:00:44.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety +Dialogue: 0,0:00:44.83,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety re +Dialogue: 0,0:00:45.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety rema +Dialogue: 0,0:00:45.72,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remain +Dialogue: 0,0:00:46.17,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains +Dialogue: 0,0:00:46.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains ou +Dialogue: 0,0:00:47.06,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our +Dialogue: 0,0:00:47.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our nu +Dialogue: 0,0:00:47.95,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our numb +Dialogue: 0,0:00:48.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number +Dialogue: 0,0:00:48.84,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number o +Dialogue: 0,0:00:49.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-charenc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-charenc index a056cd1..3d43397 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-charenc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-charenc @@ -1,62 +1,62 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:32.95,0:00:38.25,Default,,0,0,0,,КОЛУМБИА ПИКЧЪРС - АЗИЯ\NСОНИ ПИКЧЪРС и Е.Е. Co.\Nпредставят -Dialogue: 0,0:00:52.76,0:00:58.60,Default,,0,0,0,,Т И Г Ъ Р И Д Р А К О Н -Dialogue: 0,0:01:22.17,0:01:24.05,Default,,0,0,0,,Учителят Ли е тук. -Dialogue: 0,0:01:45.48,0:01:47.32,Default,,0,0,0,,Шу Лиен! -Dialogue: 0,0:01:54.53,0:01:57.24,Default,,0,0,0,,Ли Му Бай е тук. -Dialogue: 0,0:02:05.83,0:02:09.00,Default,,0,0,0,,- Как вървят нещата?\N- Добре. Моля, влезте! -Dialogue: 0,0:02:23.48,0:02:26.53,Default,,0,0,0,,Му Бай...\NМина много време. -Dialogue: 0,0:02:26.73,0:02:28.11,Default,,0,0,0,,Така е. -Dialogue: 0,0:02:28.57,0:02:31.41,Default,,0,0,0,,- Как върви бизнесът?\N- Добре. -Dialogue: 0,0:02:31.61,0:02:33.90,Default,,0,0,0,,- А ти как си?\N- Добре. -Dialogue: 0,0:02:40.16,0:02:42.79,Default,,0,0,0,,Монахът Дзенг каза,\Nче си в планината Удан. -Dialogue: 0,0:02:43.04,0:02:46.54,Default,,0,0,0,,Каза, че практикуваш\Nдълбока медитация. -Dialogue: 0,0:02:48.84,0:02:50.68,Default,,0,0,0,,Сигурно в планината\Nе много спокойно. -Dialogue: 0,0:02:51.25,0:02:53.46,Default,,0,0,0,,Завиждам ти. -Dialogue: 0,0:02:53.67,0:02:58.34,Default,,0,0,0,,Имам толкова много работа,\Nпочти не ми остава\Nвреме за почивка. -Dialogue: 0,0:03:00.26,0:03:03.89,Default,,0,0,0,,Оставих обучението рано. -Dialogue: 0,0:03:05.69,0:03:11.28,Default,,0,0,0,,Защо? Ти си боец на Удан.\NОбучението е всичко. -Dialogue: 0,0:03:11.90,0:03:14.86,Default,,0,0,0,,По време на медитация… -Dialogue: 0,0:03:15.07,0:03:18.49,Default,,0,0,0,,стигнах до място,\Nкъдето имаше дълбока тишина... -Dialogue: 0,0:03:19.87,0:03:22.79,Default,,0,0,0,,бях обграден от светлина... -Dialogue: 0,0:03:23.41,0:03:28.08,Default,,0,0,0,,времето и пространството изчезнаха. -Dialogue: 0,0:03:28.71,0:03:34.09,Default,,0,0,0,,Достигнах до състояние, за което\Nучителят не ми беше казвал. -Dialogue: 0,0:03:37.05,0:03:39.14,Default,,0,0,0,,Постигнал си просветление? -Dialogue: 0,0:03:39.34,0:03:41.22,Default,,0,0,0,,Не. -Dialogue: 0,0:03:41.72,0:03:45.81,Default,,0,0,0,,Не почувствах блаженството\Nна просветлението. -Dialogue: 0,0:03:46.02,0:03:52.86,Default,,0,0,0,,Вместо това... ме обгърна\Nбезкрайна мъка. -Dialogue: 0,0:03:53.40,0:03:56.57,Default,,0,0,0,,Не можах да издържа. -Dialogue: 0,0:03:57.49,0:03:59.74,Default,,0,0,0,,Прекъснах медитацията си. -Dialogue: 0,0:03:59.95,0:04:02.24,Default,,0,0,0,,Не можах да продължа. -Dialogue: 0,0:04:03.20,0:04:07.79,Default,,0,0,0,,Нещо...\Nме дърпаше назад. -Dialogue: 0,0:04:09.62,0:04:10.91,Default,,0,0,0,,Какво беше? -Dialogue: 0,0:04:15.46,0:04:18.00,Default,,0,0,0,,Нещо, от което не\Nмога да се освободя. -Dialogue: 0,0:04:23.39,0:04:24.68,Default,,0,0,0,,Скоро ли ще тръгваш? -Dialogue: 0,0:04:26.77,0:04:30.27,Default,,0,0,0,,Подготвяме охрана\Nза една доставка... -Dialogue: 0,0:04:30.48,0:04:31.94,Default,,0,0,0,,за Пекин. -Dialogue: 0,0:04:32.56,0:04:34.10,Default,,0,0,0,,Мога ли да те помоля... -Dialogue: 0,0:04:35.07,0:04:38.82,Default,,0,0,0,,да занесеш нещо на господин Те. -Dialogue: 0,0:04:44.28,0:04:48.12,Default,,0,0,0,,Зеленият меч на Съдбата!?\NДаваш го на господин Те!? -Dialogue: 0,0:04:48.37,0:04:52.67,Default,,0,0,0,,Да. Той винаги е бил\Nнашият най-голям покровител. -Dialogue: 0,0:04:52.88,0:04:56.55,Default,,0,0,0,,Не разбирам.\NКак можеш да се разделиш с него? -Dialogue: 0,0:04:56.76,0:04:59.93,Default,,0,0,0,,Той винаги е бил с теб. -Dialogue: 0,0:05:01.18,0:05:05.52,Default,,0,0,0,,Твърде много хора са\Nзагинали от това острие. -Dialogue: 0,0:05:09.68,0:05:14.52,Default,,0,0,0,,Чисто е единствено защото\Nкръвта се отмива лесно. -Dialogue: 0,0:05:15.40,0:05:20.61,Default,,0,0,0,,Ти го използваш справедливо.\NДостоен си за него. -Dialogue: 0,0:05:23.66,0:05:27.37,Default,,0,0,0,,Дойде време\Nда го оставя. -Dialogue: 0,0:05:27.58,0:05:31.21,Default,,0,0,0,,Е, какво ще правиш\Nот сега нататък? -Dialogue: 0,0:05:34.71,0:05:37.50,Default,,0,0,0,,Ела с мен в Пекин. -Dialogue: 0,0:05:37.71,0:05:41.42,Default,,0,0,0,,Лично ще дадеш меча\Nна господин Те. -Dialogue: 0,0:05:41.68,0:05:44.89,Default,,0,0,0,,Ще бъде както преди. -Dialogue: 0,0:05:47.01,0:05:51.68,Default,,0,0,0,,Първо трябва да отида\Nна гроба на учителя си. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:32.95,0:00:38.25,Default,,0,0,0,,КОЛУМБИА ПИКЧЪРС - АЗИЯ\NСОНИ ПИКЧЪРС и Е.Е. Co.\Nпредставят +Dialogue: 0,0:00:52.76,0:00:58.60,Default,,0,0,0,,Т И Г Ъ Р И Д Р А К О Н +Dialogue: 0,0:01:22.17,0:01:24.05,Default,,0,0,0,,Учителят Ли е тук. +Dialogue: 0,0:01:45.48,0:01:47.32,Default,,0,0,0,,Шу Лиен! +Dialogue: 0,0:01:54.53,0:01:57.24,Default,,0,0,0,,Ли Му Бай е тук. +Dialogue: 0,0:02:05.83,0:02:09.00,Default,,0,0,0,,- Как вървят нещата?\N- Добре. Моля, влезте! +Dialogue: 0,0:02:23.48,0:02:26.53,Default,,0,0,0,,Му Бай...\NМина много време. +Dialogue: 0,0:02:26.73,0:02:28.11,Default,,0,0,0,,Така е. +Dialogue: 0,0:02:28.57,0:02:31.41,Default,,0,0,0,,- Как върви бизнесът?\N- Добре. +Dialogue: 0,0:02:31.61,0:02:33.90,Default,,0,0,0,,- А ти как си?\N- Добре. +Dialogue: 0,0:02:40.16,0:02:42.79,Default,,0,0,0,,Монахът Дзенг каза,\Nче си в планината Удан. +Dialogue: 0,0:02:43.04,0:02:46.54,Default,,0,0,0,,Каза, че практикуваш\Nдълбока медитация. +Dialogue: 0,0:02:48.84,0:02:50.68,Default,,0,0,0,,Сигурно в планината\Nе много спокойно. +Dialogue: 0,0:02:51.25,0:02:53.46,Default,,0,0,0,,Завиждам ти. +Dialogue: 0,0:02:53.67,0:02:58.34,Default,,0,0,0,,Имам толкова много работа,\Nпочти не ми остава\Nвреме за почивка. +Dialogue: 0,0:03:00.26,0:03:03.89,Default,,0,0,0,,Оставих обучението рано. +Dialogue: 0,0:03:05.69,0:03:11.28,Default,,0,0,0,,Защо? Ти си боец на Удан.\NОбучението е всичко. +Dialogue: 0,0:03:11.90,0:03:14.86,Default,,0,0,0,,По време на медитация… +Dialogue: 0,0:03:15.07,0:03:18.49,Default,,0,0,0,,стигнах до място,\Nкъдето имаше дълбока тишина... +Dialogue: 0,0:03:19.87,0:03:22.79,Default,,0,0,0,,бях обграден от светлина... +Dialogue: 0,0:03:23.41,0:03:28.08,Default,,0,0,0,,времето и пространството изчезнаха. +Dialogue: 0,0:03:28.71,0:03:34.09,Default,,0,0,0,,Достигнах до състояние, за което\Nучителят не ми беше казвал. +Dialogue: 0,0:03:37.05,0:03:39.14,Default,,0,0,0,,Постигнал си просветление? +Dialogue: 0,0:03:39.34,0:03:41.22,Default,,0,0,0,,Не. +Dialogue: 0,0:03:41.72,0:03:45.81,Default,,0,0,0,,Не почувствах блаженството\Nна просветлението. +Dialogue: 0,0:03:46.02,0:03:52.86,Default,,0,0,0,,Вместо това... ме обгърна\Nбезкрайна мъка. +Dialogue: 0,0:03:53.40,0:03:56.57,Default,,0,0,0,,Не можах да издържа. +Dialogue: 0,0:03:57.49,0:03:59.74,Default,,0,0,0,,Прекъснах медитацията си. +Dialogue: 0,0:03:59.95,0:04:02.24,Default,,0,0,0,,Не можах да продължа. +Dialogue: 0,0:04:03.20,0:04:07.79,Default,,0,0,0,,Нещо...\Nме дърпаше назад. +Dialogue: 0,0:04:09.62,0:04:10.91,Default,,0,0,0,,Какво беше? +Dialogue: 0,0:04:15.46,0:04:18.00,Default,,0,0,0,,Нещо, от което не\Nмога да се освободя. +Dialogue: 0,0:04:23.39,0:04:24.68,Default,,0,0,0,,Скоро ли ще тръгваш? +Dialogue: 0,0:04:26.77,0:04:30.27,Default,,0,0,0,,Подготвяме охрана\Nза една доставка... +Dialogue: 0,0:04:30.48,0:04:31.94,Default,,0,0,0,,за Пекин. +Dialogue: 0,0:04:32.56,0:04:34.10,Default,,0,0,0,,Мога ли да те помоля... +Dialogue: 0,0:04:35.07,0:04:38.82,Default,,0,0,0,,да занесеш нещо на господин Те. +Dialogue: 0,0:04:44.28,0:04:48.12,Default,,0,0,0,,Зеленият меч на Съдбата!?\NДаваш го на господин Те!? +Dialogue: 0,0:04:48.37,0:04:52.67,Default,,0,0,0,,Да. Той винаги е бил\Nнашият най-голям покровител. +Dialogue: 0,0:04:52.88,0:04:56.55,Default,,0,0,0,,Не разбирам.\NКак можеш да се разделиш с него? +Dialogue: 0,0:04:56.76,0:04:59.93,Default,,0,0,0,,Той винаги е бил с теб. +Dialogue: 0,0:05:01.18,0:05:05.52,Default,,0,0,0,,Твърде много хора са\Nзагинали от това острие. +Dialogue: 0,0:05:09.68,0:05:14.52,Default,,0,0,0,,Чисто е единствено защото\Nкръвта се отмива лесно. +Dialogue: 0,0:05:15.40,0:05:20.61,Default,,0,0,0,,Ти го използваш справедливо.\NДостоен си за него. +Dialogue: 0,0:05:23.66,0:05:27.37,Default,,0,0,0,,Дойде време\Nда го оставя. +Dialogue: 0,0:05:27.58,0:05:31.21,Default,,0,0,0,,Е, какво ще правиш\Nот сега нататък? +Dialogue: 0,0:05:34.71,0:05:37.50,Default,,0,0,0,,Ела с мен в Пекин. +Dialogue: 0,0:05:37.71,0:05:41.42,Default,,0,0,0,,Лично ще дадеш меча\Nна господин Те. +Dialogue: 0,0:05:41.68,0:05:44.89,Default,,0,0,0,,Ще бъде както преди. +Dialogue: 0,0:05:47.01,0:05:51.68,Default,,0,0,0,,Първо трябва да отида\Nна гроба на учителя си. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-jacosub b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-jacosub index a30fe4a..4bdc5e6 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-jacosub +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-jacosub @@ -1,23 +1,23 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.12,0:00:04.36,Default,,0,0,0,,{\an5}JACOsub\N\NThis script demonstrates some of the capabilities of JACOsub. -Dialogue: 0,0:00:04.12,0:00:14.86,Default,,0,0,0,,{\an8}Text may be positioned at the top, -Dialogue: 0,0:00:05.12,0:00:17.46,Default,,0,0,0,,{\an5}middle, -Dialogue: 0,0:00:06.12,0:00:20.06,Default,,0,0,0,,{\an2}or bottom of the screen. -Dialogue: 0,0:00:08.12,0:00:27.36,Default,,0,0,0,,{\an5}{this is a comment} (And, you just saw, {another comment} timing ranges for different lines of text. -Dialogue: 0,0:00:11.12,0:00:35.86,Default,,0,0,0,,{\an1}Within margin constraints\Nthat you set, text may be\Nleft justified, -Dialogue: 0,0:00:13.62,0:00:42.11,Default,,0,0,0,,{\an2}{the JC is redundant - it's the default}center\Njustified, -Dialogue: 0,0:00:14.87,0:00:45.86,Default,,0,0,0,,{\an3}and also\Nright justified. -Dialogue: 0,0:00:22.42,0:01:12.76,Default,,0,0,0,,Text may appear in different styles\N(Normal, {\b1}Bold{\r}, {\i1}Italic{\r}) -Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,{\an5}\N\NAt that time, you may press any key to return to the Editor. -Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,OK, this script will be finished when the screen goes blank. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.12,0:00:04.36,Default,,0,0,0,,{\an5}JACOsub\N\NThis script demonstrates some of the capabilities of JACOsub. +Dialogue: 0,0:00:04.12,0:00:14.86,Default,,0,0,0,,{\an8}Text may be positioned at the top, +Dialogue: 0,0:00:05.12,0:00:17.46,Default,,0,0,0,,{\an5}middle, +Dialogue: 0,0:00:06.12,0:00:20.06,Default,,0,0,0,,{\an2}or bottom of the screen. +Dialogue: 0,0:00:08.12,0:00:27.36,Default,,0,0,0,,{\an5}{this is a comment} (And, you just saw, {another comment} timing ranges for different lines of text. +Dialogue: 0,0:00:11.12,0:00:35.86,Default,,0,0,0,,{\an1}Within margin constraints\Nthat you set, text may be\Nleft justified, +Dialogue: 0,0:00:13.62,0:00:42.11,Default,,0,0,0,,{\an2}{the JC is redundant - it's the default}center\Njustified, +Dialogue: 0,0:00:14.87,0:00:45.86,Default,,0,0,0,,{\an3}and also\Nright justified. +Dialogue: 0,0:00:22.42,0:01:12.76,Default,,0,0,0,,Text may appear in different styles\N(Normal, {\b1}Bold{\r}, {\i1}Italic{\r}) +Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,{\an5}\N\NAt that time, you may press any key to return to the Editor. +Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,OK, this script will be finished when the screen goes blank. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-microdvd b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-microdvd index d2170bc..0332da9 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-microdvd +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-microdvd @@ -1,22 +1,22 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla -Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike -Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to -Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future -Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy stuff -Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle... -Dialogue: 0,0:02:15.60,0:02:40.00,Default,,0,0,0,,...continues up to... -Dialogue: 0,0:02:40.00,0:03:00.00,Default,,0,0,0,,this one. -Dialogue: 0,0:03:04.00,0:03:12.00,Default,,0,0,0,,and now... -Dialogue: 0,0:03:12.00,9:59:59.99,Default,,0,0,0,,...to the end of the presentation +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla +Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike +Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to +Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future +Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy stuff +Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle... +Dialogue: 0,0:02:15.60,0:02:40.00,Default,,0,0,0,,...continues up to... +Dialogue: 0,0:02:40.00,0:03:00.00,Default,,0,0,0,,this one. +Dialogue: 0,0:03:04.00,0:03:12.00,Default,,0,0,0,,and now... +Dialogue: 0,0:03:12.00,9:59:59.99,Default,,0,0,0,,...to the end of the presentation diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-movtext b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-movtext index 94ed22d..9c082cd 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-movtext +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-movtext @@ -1,15 +1,15 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Serif,18,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.97,0:00:02.54,Default,,0,0,0,,- Test 1.\N- Test 2. -Dialogue: 0,0:00:03.05,0:00:04.74,Default,,0,0,0,,Test 3. -Dialogue: 0,0:00:05.85,0:00:08.14,Default,,0,0,0,,- Test 4.\N- Test 5. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Serif,18,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.97,0:00:02.54,Default,,0,0,0,,- Test 1.\N- Test 2. +Dialogue: 0,0:00:03.05,0:00:04.74,Default,,0,0,0,,Test 3. +Dialogue: 0,0:00:05.85,0:00:08.14,Default,,0,0,0,,- Test 4.\N- Test 5. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpl2 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpl2 index 72fc0fc..a985760 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpl2 +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpl2 @@ -1,16 +1,16 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:01.20,Default,,0,0,0,,Foo\Nbar\Nbla -Dialogue: 0,0:00:04.10,0:00:05.30,Default,,0,0,0,,{\i1}italic{\r}\N{\b1}bold{\r}\N{\b1}{\i1}italicbold -Dialogue: 0,0:00:05.30,0:00:07.20,Default,,0,0,0,,{\u1}underline{\r}\Nnormal -Dialogue: 0,0:00:08.40,0:00:12.80,Default,,0,0,0,,hello +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:01.20,Default,,0,0,0,,Foo\Nbar\Nbla +Dialogue: 0,0:00:04.10,0:00:05.30,Default,,0,0,0,,{\i1}italic{\r}\N{\b1}bold{\r}\N{\b1}{\i1}italicbold +Dialogue: 0,0:00:05.30,0:00:07.20,Default,,0,0,0,,{\u1}underline{\r}\Nnormal +Dialogue: 0,0:00:08.40,0:00:12.80,Default,,0,0,0,,hello diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub index 890ceb0..9fc2267 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub @@ -1,33 +1,33 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:15.00,0:00:18.00,Default,,0,0,0,,A long, long time ago... -Dialogue: 0,0:00:18.00,0:00:21.00,Default,,0,0,0,,in a galaxy far away... -Dialogue: 0,0:00:21.00,0:00:24.00,Default,,0,0,0,,Naboo was under an attack. -Dialogue: 0,0:00:25.00,0:00:27.50,Default,,0,0,0,,And I thought me and\NQui-Gon Jinn could -Dialogue: 0,0:00:27.50,0:00:30.00,Default,,0,0,0,,talk the Federation into -Dialogue: 0,0:00:30.00,0:00:34.00,Default,,0,0,0,,...maybe cutting them a\Nlittle slack. -Dialogue: 0,0:00:36.00,0:00:39.00,Default,,0,0,0,,But their response, it\Ndidn't thrill us, -Dialogue: 0,0:00:39.00,0:00:42.00,Default,,0,0,0,,They locked the doors,\Nand tried to kill us. -Dialogue: 0,0:00:42.00,0:00:44.50,Default,,0,0,0,,We escaped from that gas, -Dialogue: 0,0:00:44.50,0:00:48.00,Default,,0,0,0,,then met Jar-jar and\NBoss-Nass. -Dialogue: 0,0:00:49.00,0:00:55.00,Default,,0,0,0,,We took a bongo from the\Nscene and we went to\NTheed to see the Queen. -Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,We all wound' up on\NTatooine. -Dialogue: 0,0:01:00.00,0:01:06.00,Default,,0,0,0,,That's where, we've found\Nthis boy. -Dialogue: 0,0:01:06.00,0:01:10.00,Default,,0,0,0,,Oh my, my this here\NAnakin guy, -Dialogue: 0,0:01:10.00,0:01:15.00,Default,,0,0,0,,maybe Vader someday\Nlater now he's just\Na small fry. -Dialogue: 0,0:01:15.00,0:01:19.00,Default,,0,0,0,,And he left his home and\Nkissed his mommy goodbye, -Dialogue: 0,0:01:19.00,0:01:24.00,Default,,0,0,0,,singing "Soon I'm gonna be\Na Jedi!" -Dialogue: 0,0:01:30.00,0:01:36.00,Default,,0,0,0,,Did you know this junkyard\Nslave isn't even old enough\Nto shave, -Dialogue: 0,0:01:36.00,0:01:39.00,Default,,0,0,0,,but he can use the Force,\Nthey say. -Dialogue: 0,0:01:40.00,0:01:46.00,Default,,0,0,0,,Ahh, do you see him hitting\Non the queen though he's\Njust nine and she's fourteen -Dialogue: 0,0:01:46.00,0:01:52.00,Default,,0,0,0,,yeah, he's probably gonna\Nmarry her, someday! +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:15.00,0:00:18.00,Default,,0,0,0,,A long, long time ago... +Dialogue: 0,0:00:18.00,0:00:21.00,Default,,0,0,0,,in a galaxy far away... +Dialogue: 0,0:00:21.00,0:00:24.00,Default,,0,0,0,,Naboo was under an attack. +Dialogue: 0,0:00:25.00,0:00:27.50,Default,,0,0,0,,And I thought me and\NQui-Gon Jinn could +Dialogue: 0,0:00:27.50,0:00:30.00,Default,,0,0,0,,talk the Federation into +Dialogue: 0,0:00:30.00,0:00:34.00,Default,,0,0,0,,...maybe cutting them a\Nlittle slack. +Dialogue: 0,0:00:36.00,0:00:39.00,Default,,0,0,0,,But their response, it\Ndidn't thrill us, +Dialogue: 0,0:00:39.00,0:00:42.00,Default,,0,0,0,,They locked the doors,\Nand tried to kill us. +Dialogue: 0,0:00:42.00,0:00:44.50,Default,,0,0,0,,We escaped from that gas, +Dialogue: 0,0:00:44.50,0:00:48.00,Default,,0,0,0,,then met Jar-jar and\NBoss-Nass. +Dialogue: 0,0:00:49.00,0:00:55.00,Default,,0,0,0,,We took a bongo from the\Nscene and we went to\NTheed to see the Queen. +Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,We all wound' up on\NTatooine. +Dialogue: 0,0:01:00.00,0:01:06.00,Default,,0,0,0,,That's where, we've found\Nthis boy. +Dialogue: 0,0:01:06.00,0:01:10.00,Default,,0,0,0,,Oh my, my this here\NAnakin guy, +Dialogue: 0,0:01:10.00,0:01:15.00,Default,,0,0,0,,maybe Vader someday\Nlater now he's just\Na small fry. +Dialogue: 0,0:01:15.00,0:01:19.00,Default,,0,0,0,,And he left his home and\Nkissed his mommy goodbye, +Dialogue: 0,0:01:19.00,0:01:24.00,Default,,0,0,0,,singing "Soon I'm gonna be\Na Jedi!" +Dialogue: 0,0:01:30.00,0:01:36.00,Default,,0,0,0,,Did you know this junkyard\Nslave isn't even old enough\Nto shave, +Dialogue: 0,0:01:36.00,0:01:39.00,Default,,0,0,0,,but he can use the Force,\Nthey say. +Dialogue: 0,0:01:40.00,0:01:46.00,Default,,0,0,0,,Ahh, do you see him hitting\Non the queen though he's\Njust nine and she's fourteen +Dialogue: 0,0:01:46.00,0:01:52.00,Default,,0,0,0,,yeah, he's probably gonna\Nmarry her, someday! diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub-frames b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub-frames index 64528ec..613037b 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub-frames +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-mpsub-frames @@ -1,14 +1,14 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:01.00,0:00:02.48,Default,,0,0,0,,Start at 1sec,\Nlast 1.5 seconds -Dialogue: 0,0:00:02.52,0:00:11.52,Default,,0,0,0,,One frame later,\Nduring 9 seconds +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:01.00,0:00:02.48,Default,,0,0,0,,Start at 1sec,\Nlast 1.5 seconds +Dialogue: 0,0:00:02.52,0:00:11.52,Default,,0,0,0,,One frame later,\Nduring 9 seconds diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-pjs b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-pjs index 799c62b..6ece423 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-pjs +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-pjs @@ -1,15 +1,15 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:04:04.70,0:04:11.30,Default,,0,0,0,,You should come to the Drama Club, too. -Dialogue: 0,0:04:11.30,0:04:19.40,Default,,0,0,0,,Yeah. The Drama Club is worried\Nthat you haven't been coming. -Dialogue: 0,0:04:20.30,0:04:27.50,Default,,0,0,0,,I see. Sorry, I'll drop by next time. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:04:04.70,0:04:11.30,Default,,0,0,0,,You should come to the Drama Club, too. +Dialogue: 0,0:04:11.30,0:04:19.40,Default,,0,0,0,,Yeah. The Drama Club is worried\Nthat you haven't been coming. +Dialogue: 0,0:04:20.30,0:04:27.50,Default,,0,0,0,,I see. Sorry, I'll drop by next time. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-realtext b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-realtext index cd9aa5a..e37b200 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-realtext +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-realtext @@ -1,17 +1,17 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Mary had a little lamb, \N -Dialogue: 0,0:00:03.00,0:00:18.00,Default,,0,0,0,,little lamb, \N -Dialogue: 0,0:00:06.99,0:00:21.99,Default,,0,0,0,,little lamb, \N -Dialogue: 0,0:00:09.00,0:00:23.00,Default,,0,0,0,,Mary had a little lamb \N -Dialogue: 0,0:00:12.34,0:00:27.34,Default,,0,0,0,,whose fleece was white as snow. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Mary had a little lamb, \N +Dialogue: 0,0:00:03.00,0:00:18.00,Default,,0,0,0,,little lamb, \N +Dialogue: 0,0:00:06.99,0:00:21.99,Default,,0,0,0,,little lamb, \N +Dialogue: 0,0:00:09.00,0:00:23.00,Default,,0,0,0,,Mary had a little lamb \N +Dialogue: 0,0:00:12.34,0:00:27.34,Default,,0,0,0,,whose fleece was white as snow. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami index 3a01390..814ea67 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami @@ -1,21 +1,21 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:00.01,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\N -Dialogue: 0,0:00:00.01,0:00:08.80,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet the word go forth, from this time and place to friend and foe alike that the torch -Dialogue: 0,0:00:08.80,0:00:19.50,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nhas been passed to a new generation of Americans, born in this century, tempered by war, -Dialogue: 0,0:00:19.50,0:00:28.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Ndisciplined by a hard and bitter peace, proud of our ancient heritage, and unwilling to witness -Dialogue: 0,0:00:28.00,0:00:38.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nor permit the slow undoing of those human rights to which this nation has always -Dialogue: 0,0:00:38.00,0:00:46.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nbeen committed and to which we are committed today at home and around the world. -Dialogue: 0,0:00:46.00,0:01:01.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet every nation know, whether it wishes us well or ill, that we shall pay any price, bear any burden, -Dialogue: 0,0:01:01.00,0:01:13.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nmeet any hardship, support any friend, oppose any foe, to ensure the survival and success of liberty. -Dialogue: 0,0:01:13.00,9:59:59.99,Default,,0,0,0,,{\i1}End of:{\i0}\NPresident John F. Kennedy Speech +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:00.01,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\N +Dialogue: 0,0:00:00.01,0:00:08.80,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet the word go forth, from this time and place to friend and foe alike that the torch +Dialogue: 0,0:00:08.80,0:00:19.50,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nhas been passed to a new generation of Americans, born in this century, tempered by war, +Dialogue: 0,0:00:19.50,0:00:28.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Ndisciplined by a hard and bitter peace, proud of our ancient heritage, and unwilling to witness +Dialogue: 0,0:00:28.00,0:00:38.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nor permit the slow undoing of those human rights to which this nation has always +Dialogue: 0,0:00:38.00,0:00:46.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nbeen committed and to which we are committed today at home and around the world. +Dialogue: 0,0:00:46.00,0:01:01.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet every nation know, whether it wishes us well or ill, that we shall pay any price, bear any burden, +Dialogue: 0,0:01:01.00,0:01:13.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nmeet any hardship, support any friend, oppose any foe, to ensure the survival and success of liberty. +Dialogue: 0,0:01:13.00,9:59:59.99,Default,,0,0,0,,{\i1}End of:{\i0}\NPresident John F. Kennedy Speech diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami2 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami2 index 9e9c808..cfd4269 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami2 +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-sami2 @@ -1,91 +1,91 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:01.51,0:00:01.51,Default,,0,0,0,,by Psyence Fictionist\Npsyencefictionist@gmail.com -Dialogue: 0,0:00:01.51,0:00:08.61,Default,,0,0,0,,Sync by: honeybunny and Kerensky\Nwww.Addic7ed.com -Dialogue: 0,0:00:10.11,0:00:10.11,Default,,0,0,0,,\N{\b1}사랑과 배신\N탐욕과 살육의 이야기죠{\b0} -Dialogue: 0,0:00:10.11,0:00:13.98,Default,,0,0,0,,\N{\c&H800080&}The{\c}{\c&HCBC0FF&}re{\c} {\c&HFF&}is{\c} {\c&HA5FF&}lo{\c}{\c&HFFFF&}ve{\c} {\c&H8000&}and{\c}{\c&HFFFF00&} bet{\c}{\c&HFF0000&}rayal{\c},\N{\b1}{\c&H808080&}g{\c}r{\c&H808080&}e{\c}e{\c&H808080&}d{\c} and {\c&HFF&}m{\c}{\c&H808080&}u{\c}{\c&HFF&}rder{\c}{\b0}. -Dialogue: 0,0:00:17.67,0:00:17.67,Default,,0,0,0,,\N{\c&HFFFF&}선악의 정의에 대해서\N대립하는 가치관을 가진{\c} -Dialogue: 0,0:00:17.67,0:00:21.72,Default,,0,0,0,,\N{\c&HCBC0FF&}{\fs6}It's{\fs} {\fs8}set{\fs}{\fs10} in {\fs}{\fs12}this{\fs}{\fs14} intere{\fs}{\fs14}sting{\fs}\N{\fs16} world{\fs}{\fs18} of{\fs} {\fs20}cont{\fs}{\fs22}rasting{\fs}{\fs24} ideology{\fs}{\c} -Dialogue: 0,0:00:21.84,0:00:21.84,Default,,0,0,0,,\N{\u1}매력적인 세계에서\N이 모든 것이 펼쳐집니다{\u1} -Dialogue: 0,0:00:21.84,0:00:23.58,Default,,0,0,0,,\N{\i1}{\c&H9966CC&}of{\c}{\c&HC2A3E0&} what's{\c} {\c&HE0D1F0&}right{\c} {\c&HFCFAFE&}and{\c} wrong.{\i0} -Dialogue: 0,0:00:23.69,0:00:23.69,Default,,0,0,0,,\N{\i1}이 주제를 심오한 철학으로\N담아내고 있어요{\i0} -Dialogue: 0,0:00:23.69,0:00:25.67,Default,,0,0,0,,\N{\fs20}{\c&HFF0000&}{\s1}It{\s0}{\c}{\fs} has {\fs15}{\c&HFFFF00&}a{\c}{\fs} great {\fs16}{\c&HFFCC00&}philosophy{\c}{\fs} about it. -Dialogue: 0,0:00:40.22,0:00:40.22,Default,,0,0,0,,\N{\s1}"왕좌의 게임"은 웨스테로스라는 가상왕국의\N권력 분쟁 이야기입니다{\s0} -Dialogue: 0,0:00:40.22,0:00:47.94,Default,,0,0,0,,\N{\c&HA5FF&}{\fs26}"Game of Thrones"{\fs}{\c} {\c&H2A2AA5&}{\b1}is{\b0}{\c}{\c&HFFFF&}{\fs24}{\i1} about{\i0}{\fs}{\c} {\c&H336699&}{\fs14}power{\fs}{\c}{\c&HFF&} struggles{\c}\N{\c&HA5FF&}{\fs8}in a fantasy{\fs}{\c&HCBC0FF&} kingdom{\c&HA5FF&}, called {\fs6}Westeros.{\fs}{\c} -Dialogue: 0,0:00:48.06,0:00:48.06,Default,,0,0,0,,\N철의 왕좌를 둘러싼\N권력 분쟁이죠 -Dialogue: 0,0:00:48.06,0:00:50.76,Default,,0,0,0,,\N{\c&H8000&}And it's a power struggle\Nfor the Iron Throne,{\c} -Dialogue: 0,0:00:50.88,0:00:50.88,Default,,0,0,0,,\N{\fs20}왕국의 권력 정점이라고\N할 수 있는 자리에요{\fs} -Dialogue: 0,0:00:50.88,0:00:53.13,Default,,0,0,0,,\Nwhich is the seat of power\Nin this kingdom. -Dialogue: 0,0:00:53.25,0:00:53.25,Default,,0,0,0,,\N전운이 감도네, 네드 -Dialogue: 0,0:00:53.25,0:00:55.07,Default,,0,0,0,,\NThere's a war coming, Ned. -Dialogue: 0,0:00:56.01,0:00:56.01,Default,,0,0,0,, \N언제 누구와 싸우게 될지는 몰라\N하지만 분명 전쟁이 일어날걸세 -Dialogue: 0,0:00:56.01,0:01:00.09,Default,,0,0,0,,\NI don't know when, I don't know who\Nwould be fighting, but it's coming. -Dialogue: 0,0:01:01.10,0:01:01.10,Default,,0,0,0,,\N이야기의 핵심은 두 주요 가문의\N권력을 둘러싼 갈등입니다 -Dialogue: 0,0:01:01.10,0:01:07.04,Default,,0,0,0,,\N{\i1}At the core of it there's a conflict for\Npower between two great houses initially.{\i0} -Dialogue: 0,0:01:07.16,0:01:07.16,Default,,0,0,0,,\N스타크 가문과 라니스터 가문이죠 -Dialogue: 0,0:01:07.16,0:01:10.04,Default,,0,0,0,,\NHouse Stark and House Lannister. -Dialogue: 0,0:01:10.16,0:01:10.16,Default,,0,0,0,,\N그 외에 여러 가문이\N서로 경쟁합니다 -Dialogue: 0,0:01:10.16,0:01:13.25,Default,,0,0,0,,\NThe other major houses are\Nall contenders as well. -Dialogue: 0,0:01:13.37,0:01:13.37,Default,,0,0,0,,\N흥미진진하게 정치적으로\N얽혀있는 상황이죠 -Dialogue: 0,0:01:13.37,0:01:16.11,Default,,0,0,0,,\NIt's a suitably complicated\Npolitical situation. -Dialogue: 0,0:01:16.34,0:01:16.34,Default,,0,0,0,,\N옛 말에 "권력은 부패한다"라죠 -Dialogue: 0,0:01:16.34,0:01:18.80,Default,,0,0,0,,\NThe old truth "the power corrupts",\NI think -Dialogue: 0,0:01:18.92,0:01:18.92,Default,,0,0,0,,\N옳은 말입니다\N이 작품에서도 드러나죠 -Dialogue: 0,0:01:18.92,0:01:21.66,Default,,0,0,0,,\Nit's very valid and it\Nshows in this series. -Dialogue: 0,0:01:21.78,0:01:21.78,Default,,0,0,0,,\N권력을 얻은 등장인물들이\N어떻게 변해가는지 보시게 될겁니다 -Dialogue: 0,0:01:21.78,0:01:24.59,Default,,0,0,0,,\NYou see characters come into\Npower and how they change. -Dialogue: 0,0:01:24.71,0:01:24.71,Default,,0,0,0,,\N그렇게 등장인물들은\N대의를 보는 시야를 잃어가고 -Dialogue: 0,0:01:24.71,0:01:28.86,Default,,0,0,0,,\NIn a way it's about how people\Nforget to see the bigger picture, -Dialogue: 0,0:01:28.98,0:01:28.98,Default,,0,0,0,,\N사리사욕을 쫒는데 정신이 팔려\N공공의 위협을 외면하게 되죠 -Dialogue: 0,0:01:28.98,0:01:33.89,Default,,0,0,0,,\N{\u1}this common threat, that everybody\Nkind of ignores, because they're too busy{\u0} -Dialogue: 0,0:01:34.01,0:01:35.24,Default,,0,0,0,,\Npursuing their own interests. -Dialogue: 0,0:01:35.36,0:01:35.36,Default,,0,0,0,,\N한편, 일곱 왕국의 밖에서는\N두 개의 거대한 위협이 부상합니다 -Dialogue: 0,0:01:35.36,0:01:40.23,Default,,0,0,0,,\N{\fs30}And meanwhile, outside the Seven\NKingdoms, two great threats arising.{\fs} -Dialogue: 0,0:01:40.35,0:01:40.35,Default,,0,0,0,,\N하나는 바다 건너\N타가리엔 일족 유배자들이며 -Dialogue: 0,0:01:40.35,0:01:44.06,Default,,0,0,0,,\NOne across the sea, in the exile\NTargaryen siblings, -Dialogue: 0,0:01:44.17,0:01:44.17,Default,,0,0,0,,\N또 하나는 일곱 왕국의\N국경이 자리잡은 -Dialogue: 0,0:01:44.17,0:01:47.39,Default,,0,0,0,,\Nand another far to the north,\Nbeyond the Wall, -Dialogue: 0,0:01:47.51,0:01:47.51,Default,,0,0,0,,\N저 멀리 북쪽 장벽 너머\N초자연적인 존재들이 도사리는 -Dialogue: 0,0:01:47.51,0:01:50.07,Default,,0,0,0,,\Nwhich is the boundary\Nof the Seven Kingdoms, -Dialogue: 0,0:01:50.18,0:01:50.18,Default,,0,0,0,,\N춥디 추운 땅에서 일어납니다 -Dialogue: 0,0:01:50.18,0:01:55.28,Default,,0,0,0,,\Nin lands of perpetual ice and cold,\Nwhere supernatural threat is stirring. -Dialogue: 0,0:01:56.45,0:01:56.45,Default,,0,0,0,,\N기존의 어떤 작품과도 다릅니다 -Dialogue: 0,0:01:56.45,0:02:00.45,Default,,0,0,0,,\NIt's very different from\Nanything that's been done. -Dialogue: 0,0:02:00.58,0:02:00.58,Default,,0,0,0,,\N이 작품처럼 어두운 판타지는\N없을거라고 봅니다 -Dialogue: 0,0:02:00.58,0:02:03.97,Default,,0,0,0,,\NI can't think of another fantasy\Nwhich is as dark as this one is, -Dialogue: 0,0:02:04.09,0:02:04.09,Default,,0,0,0,,\N아주 적나라하고 현실적이죠 -Dialogue: 0,0:02:04.09,0:02:05.65,Default,,0,0,0,,\Nwhich is as gritty and as real. -Dialogue: 0,0:02:05.77,0:02:05.77,Default,,0,0,0,,\N등장인물 하나 하나가\N매우 심도깊습니다 -Dialogue: 0,0:02:05.77,0:02:08.18,Default,,0,0,0,,\NEvery single character\Nis incredibly complex. -Dialogue: 0,0:02:08.30,0:02:08.30,Default,,0,0,0,,\N보여주는 모습만으로\N생기는 고정관념으로는 -Dialogue: 0,0:02:08.30,0:02:09.33,Default,,0,0,0,,\NYou think you know them. -Dialogue: 0,0:02:09.45,0:02:09.45,Default,,0,0,0,,\N등장인물을 제대로 이해했다고\N할 수 없습니다 -Dialogue: 0,0:02:09.45,0:02:14.14,Default,,0,0,0,,\NYou think you got them pegged as what\Nthey seemingly are but they really aren't. -Dialogue: 0,0:02:14.25,0:02:14.25,Default,,0,0,0,,\N신하 중에서 전적으로\N신뢰할 수 있는 이가 있습니까? -Dialogue: 0,0:02:14.25,0:02:17.66,Default,,0,0,0,,\NIs there someone in your service\Nwhom you trust completely? -Dialogue: 0,0:02:17.78,0:02:17.78,Default,,0,0,0,,\N있네 -Dialogue: 0,0:02:17.78,0:02:18.84,Default,,0,0,0,,\NYes. -Dialogue: 0,0:02:18.96,0:02:18.96,Default,,0,0,0,,\N"없다"라고 대답하셔야\N현명하신겁니다, 전하 -Dialogue: 0,0:02:18.96,0:02:21.27,Default,,0,0,0,,\NThe wiser answer was "no", my lord. -Dialogue: 0,0:02:21.53,0:02:21.53,Default,,0,0,0,,\N이분법적인 선악의\N이야기가 아닙니다 -Dialogue: 0,0:02:21.53,0:02:23.63,Default,,0,0,0,,\NIt's not a good guys/bad guys story. -Dialogue: 0,0:02:23.75,0:02:23.75,Default,,0,0,0,,\N모두가 나름의 가치를\N추구하고 -Dialogue: 0,0:02:23.75,0:02:26.40,Default,,0,0,0,,\NIt's a story where everybody is\Npursuing their own interests -Dialogue: 0,0:02:26.52,0:02:26.52,Default,,0,0,0,,\N나름의 규칙을 따르면서 -Dialogue: 0,0:02:26.52,0:02:29.67,Default,,0,0,0,,\Nand everybody's following their own\Ncode and it's about those interests -Dialogue: 0,0:02:29.79,0:02:29.79,Default,,0,0,0,,\N서로의 가치와 윤리가\N충돌하게 되는 이야기입니다 -Dialogue: 0,0:02:29.79,0:02:33.35,Default,,0,0,0,,\Nand those ethics coming into\Nconflict with each other. -Dialogue: 0,0:02:33.47,0:02:33.47,Default,,0,0,0,,\N영웅이 악당을 물리치는 이야기보다 -Dialogue: 0,0:02:33.47,0:02:37.58,Default,,0,0,0,,\NAnd it provides a much richer story\Nthan the guys in white -Dialogue: 0,0:02:38.58,0:02:38.58,Default,,0,0,0,,\Nby Psyence Fictionist\Npsyencefictionist@gmail.com -Dialogue: 0,0:02:38.58,0:02:39.58,Default,,0,0,0,,\NSync by: honeybunny and Kerensky\Nwww.Addic7ed.com +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:01.51,0:00:01.51,Default,,0,0,0,,by Psyence Fictionist\Npsyencefictionist@gmail.com +Dialogue: 0,0:00:01.51,0:00:08.61,Default,,0,0,0,,Sync by: honeybunny and Kerensky\Nwww.Addic7ed.com +Dialogue: 0,0:00:10.11,0:00:10.11,Default,,0,0,0,,\N{\b1}사랑과 배신\N탐욕과 살육의 이야기죠{\b0} +Dialogue: 0,0:00:10.11,0:00:13.98,Default,,0,0,0,,\N{\c&H800080&}The{\c}{\c&HCBC0FF&}re{\c} {\c&HFF&}is{\c} {\c&HA5FF&}lo{\c}{\c&HFFFF&}ve{\c} {\c&H8000&}and{\c}{\c&HFFFF00&} bet{\c}{\c&HFF0000&}rayal{\c},\N{\b1}{\c&H808080&}g{\c}r{\c&H808080&}e{\c}e{\c&H808080&}d{\c} and {\c&HFF&}m{\c}{\c&H808080&}u{\c}{\c&HFF&}rder{\c}{\b0}. +Dialogue: 0,0:00:17.67,0:00:17.67,Default,,0,0,0,,\N{\c&HFFFF&}선악의 정의에 대해서\N대립하는 가치관을 가진{\c} +Dialogue: 0,0:00:17.67,0:00:21.72,Default,,0,0,0,,\N{\c&HCBC0FF&}{\fs6}It's{\fs} {\fs8}set{\fs}{\fs10} in {\fs}{\fs12}this{\fs}{\fs14} intere{\fs}{\fs14}sting{\fs}\N{\fs16} world{\fs}{\fs18} of{\fs} {\fs20}cont{\fs}{\fs22}rasting{\fs}{\fs24} ideology{\fs}{\c} +Dialogue: 0,0:00:21.84,0:00:21.84,Default,,0,0,0,,\N{\u1}매력적인 세계에서\N이 모든 것이 펼쳐집니다{\u1} +Dialogue: 0,0:00:21.84,0:00:23.58,Default,,0,0,0,,\N{\i1}{\c&H9966CC&}of{\c}{\c&HC2A3E0&} what's{\c} {\c&HE0D1F0&}right{\c} {\c&HFCFAFE&}and{\c} wrong.{\i0} +Dialogue: 0,0:00:23.69,0:00:23.69,Default,,0,0,0,,\N{\i1}이 주제를 심오한 철학으로\N담아내고 있어요{\i0} +Dialogue: 0,0:00:23.69,0:00:25.67,Default,,0,0,0,,\N{\fs20}{\c&HFF0000&}{\s1}It{\s0}{\c}{\fs} has {\fs15}{\c&HFFFF00&}a{\c}{\fs} great {\fs16}{\c&HFFCC00&}philosophy{\c}{\fs} about it. +Dialogue: 0,0:00:40.22,0:00:40.22,Default,,0,0,0,,\N{\s1}"왕좌의 게임"은 웨스테로스라는 가상왕국의\N권력 분쟁 이야기입니다{\s0} +Dialogue: 0,0:00:40.22,0:00:47.94,Default,,0,0,0,,\N{\c&HA5FF&}{\fs26}"Game of Thrones"{\fs}{\c} {\c&H2A2AA5&}{\b1}is{\b0}{\c}{\c&HFFFF&}{\fs24}{\i1} about{\i0}{\fs}{\c} {\c&H336699&}{\fs14}power{\fs}{\c}{\c&HFF&} struggles{\c}\N{\c&HA5FF&}{\fs8}in a fantasy{\fs}{\c&HCBC0FF&} kingdom{\c&HA5FF&}, called {\fs6}Westeros.{\fs}{\c} +Dialogue: 0,0:00:48.06,0:00:48.06,Default,,0,0,0,,\N철의 왕좌를 둘러싼\N권력 분쟁이죠 +Dialogue: 0,0:00:48.06,0:00:50.76,Default,,0,0,0,,\N{\c&H8000&}And it's a power struggle\Nfor the Iron Throne,{\c} +Dialogue: 0,0:00:50.88,0:00:50.88,Default,,0,0,0,,\N{\fs20}왕국의 권력 정점이라고\N할 수 있는 자리에요{\fs} +Dialogue: 0,0:00:50.88,0:00:53.13,Default,,0,0,0,,\Nwhich is the seat of power\Nin this kingdom. +Dialogue: 0,0:00:53.25,0:00:53.25,Default,,0,0,0,,\N전운이 감도네, 네드 +Dialogue: 0,0:00:53.25,0:00:55.07,Default,,0,0,0,,\NThere's a war coming, Ned. +Dialogue: 0,0:00:56.01,0:00:56.01,Default,,0,0,0,, \N언제 누구와 싸우게 될지는 몰라\N하지만 분명 전쟁이 일어날걸세 +Dialogue: 0,0:00:56.01,0:01:00.09,Default,,0,0,0,,\NI don't know when, I don't know who\Nwould be fighting, but it's coming. +Dialogue: 0,0:01:01.10,0:01:01.10,Default,,0,0,0,,\N이야기의 핵심은 두 주요 가문의\N권력을 둘러싼 갈등입니다 +Dialogue: 0,0:01:01.10,0:01:07.04,Default,,0,0,0,,\N{\i1}At the core of it there's a conflict for\Npower between two great houses initially.{\i0} +Dialogue: 0,0:01:07.16,0:01:07.16,Default,,0,0,0,,\N스타크 가문과 라니스터 가문이죠 +Dialogue: 0,0:01:07.16,0:01:10.04,Default,,0,0,0,,\NHouse Stark and House Lannister. +Dialogue: 0,0:01:10.16,0:01:10.16,Default,,0,0,0,,\N그 외에 여러 가문이\N서로 경쟁합니다 +Dialogue: 0,0:01:10.16,0:01:13.25,Default,,0,0,0,,\NThe other major houses are\Nall contenders as well. +Dialogue: 0,0:01:13.37,0:01:13.37,Default,,0,0,0,,\N흥미진진하게 정치적으로\N얽혀있는 상황이죠 +Dialogue: 0,0:01:13.37,0:01:16.11,Default,,0,0,0,,\NIt's a suitably complicated\Npolitical situation. +Dialogue: 0,0:01:16.34,0:01:16.34,Default,,0,0,0,,\N옛 말에 "권력은 부패한다"라죠 +Dialogue: 0,0:01:16.34,0:01:18.80,Default,,0,0,0,,\NThe old truth "the power corrupts",\NI think +Dialogue: 0,0:01:18.92,0:01:18.92,Default,,0,0,0,,\N옳은 말입니다\N이 작품에서도 드러나죠 +Dialogue: 0,0:01:18.92,0:01:21.66,Default,,0,0,0,,\Nit's very valid and it\Nshows in this series. +Dialogue: 0,0:01:21.78,0:01:21.78,Default,,0,0,0,,\N권력을 얻은 등장인물들이\N어떻게 변해가는지 보시게 될겁니다 +Dialogue: 0,0:01:21.78,0:01:24.59,Default,,0,0,0,,\NYou see characters come into\Npower and how they change. +Dialogue: 0,0:01:24.71,0:01:24.71,Default,,0,0,0,,\N그렇게 등장인물들은\N대의를 보는 시야를 잃어가고 +Dialogue: 0,0:01:24.71,0:01:28.86,Default,,0,0,0,,\NIn a way it's about how people\Nforget to see the bigger picture, +Dialogue: 0,0:01:28.98,0:01:28.98,Default,,0,0,0,,\N사리사욕을 쫒는데 정신이 팔려\N공공의 위협을 외면하게 되죠 +Dialogue: 0,0:01:28.98,0:01:33.89,Default,,0,0,0,,\N{\u1}this common threat, that everybody\Nkind of ignores, because they're too busy{\u0} +Dialogue: 0,0:01:34.01,0:01:35.24,Default,,0,0,0,,\Npursuing their own interests. +Dialogue: 0,0:01:35.36,0:01:35.36,Default,,0,0,0,,\N한편, 일곱 왕국의 밖에서는\N두 개의 거대한 위협이 부상합니다 +Dialogue: 0,0:01:35.36,0:01:40.23,Default,,0,0,0,,\N{\fs30}And meanwhile, outside the Seven\NKingdoms, two great threats arising.{\fs} +Dialogue: 0,0:01:40.35,0:01:40.35,Default,,0,0,0,,\N하나는 바다 건너\N타가리엔 일족 유배자들이며 +Dialogue: 0,0:01:40.35,0:01:44.06,Default,,0,0,0,,\NOne across the sea, in the exile\NTargaryen siblings, +Dialogue: 0,0:01:44.17,0:01:44.17,Default,,0,0,0,,\N또 하나는 일곱 왕국의\N국경이 자리잡은 +Dialogue: 0,0:01:44.17,0:01:47.39,Default,,0,0,0,,\Nand another far to the north,\Nbeyond the Wall, +Dialogue: 0,0:01:47.51,0:01:47.51,Default,,0,0,0,,\N저 멀리 북쪽 장벽 너머\N초자연적인 존재들이 도사리는 +Dialogue: 0,0:01:47.51,0:01:50.07,Default,,0,0,0,,\Nwhich is the boundary\Nof the Seven Kingdoms, +Dialogue: 0,0:01:50.18,0:01:50.18,Default,,0,0,0,,\N춥디 추운 땅에서 일어납니다 +Dialogue: 0,0:01:50.18,0:01:55.28,Default,,0,0,0,,\Nin lands of perpetual ice and cold,\Nwhere supernatural threat is stirring. +Dialogue: 0,0:01:56.45,0:01:56.45,Default,,0,0,0,,\N기존의 어떤 작품과도 다릅니다 +Dialogue: 0,0:01:56.45,0:02:00.45,Default,,0,0,0,,\NIt's very different from\Nanything that's been done. +Dialogue: 0,0:02:00.58,0:02:00.58,Default,,0,0,0,,\N이 작품처럼 어두운 판타지는\N없을거라고 봅니다 +Dialogue: 0,0:02:00.58,0:02:03.97,Default,,0,0,0,,\NI can't think of another fantasy\Nwhich is as dark as this one is, +Dialogue: 0,0:02:04.09,0:02:04.09,Default,,0,0,0,,\N아주 적나라하고 현실적이죠 +Dialogue: 0,0:02:04.09,0:02:05.65,Default,,0,0,0,,\Nwhich is as gritty and as real. +Dialogue: 0,0:02:05.77,0:02:05.77,Default,,0,0,0,,\N등장인물 하나 하나가\N매우 심도깊습니다 +Dialogue: 0,0:02:05.77,0:02:08.18,Default,,0,0,0,,\NEvery single character\Nis incredibly complex. +Dialogue: 0,0:02:08.30,0:02:08.30,Default,,0,0,0,,\N보여주는 모습만으로\N생기는 고정관념으로는 +Dialogue: 0,0:02:08.30,0:02:09.33,Default,,0,0,0,,\NYou think you know them. +Dialogue: 0,0:02:09.45,0:02:09.45,Default,,0,0,0,,\N등장인물을 제대로 이해했다고\N할 수 없습니다 +Dialogue: 0,0:02:09.45,0:02:14.14,Default,,0,0,0,,\NYou think you got them pegged as what\Nthey seemingly are but they really aren't. +Dialogue: 0,0:02:14.25,0:02:14.25,Default,,0,0,0,,\N신하 중에서 전적으로\N신뢰할 수 있는 이가 있습니까? +Dialogue: 0,0:02:14.25,0:02:17.66,Default,,0,0,0,,\NIs there someone in your service\Nwhom you trust completely? +Dialogue: 0,0:02:17.78,0:02:17.78,Default,,0,0,0,,\N있네 +Dialogue: 0,0:02:17.78,0:02:18.84,Default,,0,0,0,,\NYes. +Dialogue: 0,0:02:18.96,0:02:18.96,Default,,0,0,0,,\N"없다"라고 대답하셔야\N현명하신겁니다, 전하 +Dialogue: 0,0:02:18.96,0:02:21.27,Default,,0,0,0,,\NThe wiser answer was "no", my lord. +Dialogue: 0,0:02:21.53,0:02:21.53,Default,,0,0,0,,\N이분법적인 선악의\N이야기가 아닙니다 +Dialogue: 0,0:02:21.53,0:02:23.63,Default,,0,0,0,,\NIt's not a good guys/bad guys story. +Dialogue: 0,0:02:23.75,0:02:23.75,Default,,0,0,0,,\N모두가 나름의 가치를\N추구하고 +Dialogue: 0,0:02:23.75,0:02:26.40,Default,,0,0,0,,\NIt's a story where everybody is\Npursuing their own interests +Dialogue: 0,0:02:26.52,0:02:26.52,Default,,0,0,0,,\N나름의 규칙을 따르면서 +Dialogue: 0,0:02:26.52,0:02:29.67,Default,,0,0,0,,\Nand everybody's following their own\Ncode and it's about those interests +Dialogue: 0,0:02:29.79,0:02:29.79,Default,,0,0,0,,\N서로의 가치와 윤리가\N충돌하게 되는 이야기입니다 +Dialogue: 0,0:02:29.79,0:02:33.35,Default,,0,0,0,,\Nand those ethics coming into\Nconflict with each other. +Dialogue: 0,0:02:33.47,0:02:33.47,Default,,0,0,0,,\N영웅이 악당을 물리치는 이야기보다 +Dialogue: 0,0:02:33.47,0:02:37.58,Default,,0,0,0,,\NAnd it provides a much richer story\Nthan the guys in white +Dialogue: 0,0:02:38.58,0:02:38.58,Default,,0,0,0,,\Nby Psyence Fictionist\Npsyencefictionist@gmail.com +Dialogue: 0,0:02:38.58,0:02:39.58,Default,,0,0,0,,\NSync by: honeybunny and Kerensky\Nwww.Addic7ed.com diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-srt b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-srt index 40b20cd..4801372 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-srt +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-srt @@ -1,49 +1,49 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Don't show this text it may be used to insert hidden data -Dialogue: 0,0:00:01.50,0:00:04.50,Default,,0,0,0,,SubRip subtitles capability tester 1.3o by ale5000\N{\b1}{\i1}Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others{\i0}{\b0}\N{\c&HFF0000&}This text should be blue{\c}\N{\c&HFF&}This text should be red{\c}\N{\c&H0&}This text should be black{\c}\N{\fnWebdings}If you see this with the normal font, the player don't (fully) support font face{\fn} -Dialogue: 0,0:00:04.50,0:00:04.50,Default,,0,0,0,,Hidden -Dialogue: 0,0:00:04.50,0:00:07.50,Default,,0,0,0,,{\fs8}This text should be small{\fs}\NThis text should be normal\N{\fs35}This text should be big{\fs} -Dialogue: 0,0:00:07.50,0:00:11.50,Default,,0,0,0,,This should be an E with an accent: È\N日本語\N{\fs30}{\b1}{\i1}{\u1}This text should be bold, italics and underline{\u0}{\i0}{\b0}{\fs}\N{\fs9}{\c&HFF00&}This text should be small and green{\c}{\fs}\N{\fs9}{\c&HFF&}This text should be small and red{\c}{\fs}\N{\fs24}{\c&H2A2AA5&}This text should be big and brown{\c}{\fs} -Dialogue: 0,0:00:11.50,0:00:14.50,Default,,0,0,0,,{\b1}This line should be bold{\b0}\N{\i1}This line should be italics{\i0}\N{\u1}This line should be underline{\u0}\N{\s1}This line should be strikethrough{\s0}\N{\u1}Both lines\Nshould be underline{\u0} -Dialogue: 0,0:00:14.50,0:00:17.50,Default,,0,0,0,,>\NIt would be a good thing to\Nhide invalid html tags that are closed and show the text in them\Nbut show un-closed invalid html tags\NShow not opened tags\N< -Dialogue: 0,0:00:17.50,0:00:20.50,Default,,0,0,0,,and also\Nhide invalid html tags with parameters that are closed and show the text in them\Nbut show un-closed invalid html tags\N{\u1}This text should be showed underlined without problems also: 2<3,5>1,4<6{\u0}\NThis shouldn't be underlined -Dialogue: 0,0:00:20.50,0:00:21.50,Default,,0,0,0,,This text should be in the normal position... -Dialogue: 0,0:00:21.50,0:00:22.50,Default,,0,0,0,,{\an5}{\pos(0,45)}This text should NOT be in the normal position -Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,Implementation is the same of the ASS tag\N{\an8}This text should be at the\Ntop and horizontally centered -Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an5}This text should be at the\Nmiddle and horizontally centered -Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an2}This text should be at the\Nbottom and horizontally centered -Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,This text should be at the\Ntop and horizontally at the left{\an7} -Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an4}This text should be at the\Nmiddle and horizontally at the left\N(The second position must be ignored) -Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an1}This text should be at the\Nbottom and horizontally at the left -Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an9}This text should be at the\Ntop and horizontally at the right -Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an6}This text should be at the\Nmiddle and horizontally at the right -Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an3}This text should be at the\Nbottom and horizontally at the right -Dialogue: 0,0:00:28.50,0:00:31.50,Default,,0,0,0,,{\fs6}{\c&HFF00&}This could be the {\fs35}m{\c&H0&}o{\c&HFF00&}st{\fs6} difficult thing to implement{\c}{\fs} -Dialogue: 0,0:00:31.50,0:00:50.50,Default,,0,0,0,,First text -Dialogue: 0,0:00:33.50,0:00:35.50,Default,,0,0,0,,Second, it shouldn't overlap first -Dialogue: 0,0:00:35.50,0:00:37.50,Default,,0,0,0,,Third, it should replace second -Dialogue: 0,0:00:36.50,0:00:50.50,Default,,0,0,0,,Fourth, it shouldn't overlap first and third -Dialogue: 0,0:00:40.50,0:00:45.50,Default,,0,0,0,,Fifth, it should replace third -Dialogue: 0,0:00:45.50,0:00:50.50,Default,,0,0,0,,Sixth, it shouldn't be\Nshowed overlapped -Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,TEXT 1 (bottom) -Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,text 2 -Dialogue: 0,0:00:52.50,0:00:54.50,Default,,0,0,0,,Hide these tags:\Nalso hide these tags:\Nbut show this: {normal text} -Dialogue: 0,0:00:54.50,0:01:00.50,Default,,0,0,0,,{\an8}\N\ N is a forced line break\N\ h is a hard space\NNormal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.\NThe\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D -Dialogue: 0,0:00:54.50,0:00:56.50,Default,,0,0,0,,{\an1}\N\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal spaces followed by a letter)\NA (No hard spaces followed by a letter) -Dialogue: 0,0:00:56.50,0:00:58.50,Default,,0,0,0,,\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal spaces followed by a letter)\NA (No hard spaces followed by a letter)\NShow this: \TEST and this: \-) -Dialogue: 0,0:00:58.50,0:01:00.50,Default,,0,0,0,,{\an3}\NA letter followed by 05 hard spaces: A\h\h\h\h\h\NA letter followed by normal spaces: A\NA letter followed by no hard spaces: A\N05 hard spaces between letters: A\h\h\h\h\hA\N5 normal spaces between letters: A A\N\N^--Forced line break -Dialogue: 0,0:01:00.50,0:01:02.50,Default,,0,0,0,,{\s1}Both line should be strikethrough,\Nyes.{\s0}\NCorrectly closed tags\Nshould be hidden. -Dialogue: 0,0:01:02.50,0:01:04.50,Default,,0,0,0,,It shouldn't be strikethrough,\Nnot opened tag showed as text.\NNot opened tag showed as text. -Dialogue: 0,0:01:04.50,0:01:06.50,Default,,0,0,0,,{\s1}Three lines should be strikethrough,\Nyes.\NNot closed tags showed as text -Dialogue: 0,0:01:06.50,0:01:08.50,Default,,0,0,0,,{\s1}Both line should be strikethrough but\Nthe wrong closing tag should be showed +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Don't show this text it may be used to insert hidden data +Dialogue: 0,0:00:01.50,0:00:04.50,Default,,0,0,0,,SubRip subtitles capability tester 1.3o by ale5000\N{\b1}{\i1}Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others{\i0}{\b0}\N{\c&HFF0000&}This text should be blue{\c}\N{\c&HFF&}This text should be red{\c}\N{\c&H0&}This text should be black{\c}\N{\fnWebdings}If you see this with the normal font, the player don't (fully) support font face{\fn} +Dialogue: 0,0:00:04.50,0:00:04.50,Default,,0,0,0,,Hidden +Dialogue: 0,0:00:04.50,0:00:07.50,Default,,0,0,0,,{\fs8}This text should be small{\fs}\NThis text should be normal\N{\fs35}This text should be big{\fs} +Dialogue: 0,0:00:07.50,0:00:11.50,Default,,0,0,0,,This should be an E with an accent: È\N日本語\N{\fs30}{\b1}{\i1}{\u1}This text should be bold, italics and underline{\u0}{\i0}{\b0}{\fs}\N{\fs9}{\c&HFF00&}This text should be small and green{\c}{\fs}\N{\fs9}{\c&HFF&}This text should be small and red{\c}{\fs}\N{\fs24}{\c&H2A2AA5&}This text should be big and brown{\c}{\fs} +Dialogue: 0,0:00:11.50,0:00:14.50,Default,,0,0,0,,{\b1}This line should be bold{\b0}\N{\i1}This line should be italics{\i0}\N{\u1}This line should be underline{\u0}\N{\s1}This line should be strikethrough{\s0}\N{\u1}Both lines\Nshould be underline{\u0} +Dialogue: 0,0:00:14.50,0:00:17.50,Default,,0,0,0,,>\NIt would be a good thing to\Nhide invalid html tags that are closed and show the text in them\Nbut show un-closed invalid html tags\NShow not opened tags\N< +Dialogue: 0,0:00:17.50,0:00:20.50,Default,,0,0,0,,and also\Nhide invalid html tags with parameters that are closed and show the text in them\Nbut show un-closed invalid html tags\N{\u1}This text should be showed underlined without problems also: 2<3,5>1,4<6{\u0}\NThis shouldn't be underlined +Dialogue: 0,0:00:20.50,0:00:21.50,Default,,0,0,0,,This text should be in the normal position... +Dialogue: 0,0:00:21.50,0:00:22.50,Default,,0,0,0,,{\an5}{\pos(0,45)}This text should NOT be in the normal position +Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,Implementation is the same of the ASS tag\N{\an8}This text should be at the\Ntop and horizontally centered +Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an5}This text should be at the\Nmiddle and horizontally centered +Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an2}This text should be at the\Nbottom and horizontally centered +Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,This text should be at the\Ntop and horizontally at the left{\an7} +Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an4}This text should be at the\Nmiddle and horizontally at the left\N(The second position must be ignored) +Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an1}This text should be at the\Nbottom and horizontally at the left +Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an9}This text should be at the\Ntop and horizontally at the right +Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an6}This text should be at the\Nmiddle and horizontally at the right +Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an3}This text should be at the\Nbottom and horizontally at the right +Dialogue: 0,0:00:28.50,0:00:31.50,Default,,0,0,0,,{\fs6}{\c&HFF00&}This could be the {\fs35}m{\c&H0&}o{\c&HFF00&}st{\fs6} difficult thing to implement{\c}{\fs} +Dialogue: 0,0:00:31.50,0:00:50.50,Default,,0,0,0,,First text +Dialogue: 0,0:00:33.50,0:00:35.50,Default,,0,0,0,,Second, it shouldn't overlap first +Dialogue: 0,0:00:35.50,0:00:37.50,Default,,0,0,0,,Third, it should replace second +Dialogue: 0,0:00:36.50,0:00:50.50,Default,,0,0,0,,Fourth, it shouldn't overlap first and third +Dialogue: 0,0:00:40.50,0:00:45.50,Default,,0,0,0,,Fifth, it should replace third +Dialogue: 0,0:00:45.50,0:00:50.50,Default,,0,0,0,,Sixth, it shouldn't be\Nshowed overlapped +Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,TEXT 1 (bottom) +Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,text 2 +Dialogue: 0,0:00:52.50,0:00:54.50,Default,,0,0,0,,Hide these tags:\Nalso hide these tags:\Nbut show this: {normal text} +Dialogue: 0,0:00:54.50,0:01:00.50,Default,,0,0,0,,{\an8}\N\ N is a forced line break\N\ h is a hard space\NNormal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.\NThe\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D +Dialogue: 0,0:00:54.50,0:00:56.50,Default,,0,0,0,,{\an1}\N\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal spaces followed by a letter)\NA (No hard spaces followed by a letter) +Dialogue: 0,0:00:56.50,0:00:58.50,Default,,0,0,0,,\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal spaces followed by a letter)\NA (No hard spaces followed by a letter)\NShow this: \TEST and this: \-) +Dialogue: 0,0:00:58.50,0:01:00.50,Default,,0,0,0,,{\an3}\NA letter followed by 05 hard spaces: A\h\h\h\h\h\NA letter followed by normal spaces: A\NA letter followed by no hard spaces: A\N05 hard spaces between letters: A\h\h\h\h\hA\N5 normal spaces between letters: A A\N\N^--Forced line break +Dialogue: 0,0:01:00.50,0:01:02.50,Default,,0,0,0,,{\s1}Both line should be strikethrough,\Nyes.{\s0}\NCorrectly closed tags\Nshould be hidden. +Dialogue: 0,0:01:02.50,0:01:04.50,Default,,0,0,0,,It shouldn't be strikethrough,\Nnot opened tag showed as text.\NNot opened tag showed as text. +Dialogue: 0,0:01:04.50,0:01:06.50,Default,,0,0,0,,{\s1}Three lines should be strikethrough,\Nyes.\NNot closed tags showed as text +Dialogue: 0,0:01:06.50,0:01:08.50,Default,,0,0,0,,{\s1}Both line should be strikethrough but\Nthe wrong closing tag should be showed diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ssa-to-ass-remux b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ssa-to-ass-remux index f4405df..2602d39 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ssa-to-ass-remux +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-ssa-to-ass-remux @@ -1,84 +1,84 @@ -[Script Info] -; Script generated by Aegisub 2.1.7 -; http://www.aegisub.net -ScriptType: v4.00 -Collisions: Normal -PlayResY: 534 -PlayResX: 720 -WrapStyle: 0 -ScaledBorderAndShadow: no -Video File: 01-.mkv -Video Aspect Ratio: 1 -Video Zoom: 8 -Video Position: 36805 -Last Style Storage: Default -Export Encoding: UTF-8 -Export filters: Karaoke template -Title: Alien Nine 01 -Original Script: ? -Original Translation: ? -Original Editing: ? -Original Timing: ? -Synch Point: ? -Script Updated By: lM -Update Details: Kareoke by Pahndamonium - -[V4 Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding -Style: Song (romaji) ED-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,6,30,30,16,0,0 -Style: SongED-furigana,Verdana,15,1393701,8454016,0,16777215,-1,-1,1,1,0,2,30,30,26,0,0 -Style: Song (romaji) OP-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,2,30,30,18,0,0 -Style: SongOP-furigana,Verdana,15,3305768,8454016,0,16777215,-1,0,1,1,0,2,30,30,30,0,0 -Style: Signs-furigana,Arial,14,16777215,65535,0,0,-1,0,1,1,0,2,40,40,28,0,0 -Style: CF2-furigana,Verdana,14,16777215,16777215,0,0,-1,-1,1,1,0,2,30,30,30,0,0 -Style: Default-furigana,Verdana,14,16777215,65535,0,0,-1,0,1,1,0,2,30,30,28,0,0 -Style: Default,Verdana,28,16777215,65535,0,0,-1,0,1,2,0,2,30,30,28,0,0 -Style: CF2,Verdana,28,16777215,16777215,0,0,-1,-1,1,2,0,2,30,30,30,0,0 -Style: Signs,Arial,28,16777215,65535,0,0,-1,0,1,2,0,2,40,40,28,0,0 -Style: SongOP,Verdana,30,3305768,8454016,0,16777215,-1,0,1,2,0,2,30,30,30,0,0 -Style: Song (romaji) OP,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,2,30,30,18,0,0 -Style: SongED,Verdana,30,1393701,8454016,0,16777215,-1,-1,1,2,0,2,30,30,26,0,0 -Style: Song (romaji) ED,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,6,30,30,16,0,0 - -[Events] -Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: Marked=0,0:00:02.42,0:00:03.00,*Default,,0000,0000 ,0000,,{\fnComic Sans MS\c&HFF80FF&}All Japan Boys Soccer Tournament Opens! -Dialogue: Marked=0,0:00:59.60,0:01:00.60,Default,NTP,0000,0000,0000,,Tak tady jsi... -Dialogue: Marked=0,0:01:00.81,0:01:01.39,Default,NTP,0000,0000,0000,,Ahoj. -Dialogue: Marked=0,0:01:01.52,0:01:03.98,Default,NTP,0000,0000,0000,,Pojď se mnou. -Dialogue: Marked=0,0:01:19.71,0:01:30.26,*Default,SONG,0000,0000,0092,,When you hear the bell of Chirin,... -Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0000,,YASASHII MATSUGE WO HOHOEMI WO -Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0092,,...recall those soft lashes and that gentle smile. -Dialogue: Marked=0,0:01:40.46,0:01:50.72,*Default,SONG,0000,0000,0000,,CHIRIN NO SUZU DE OMOIDASU -Dialogue: Marked=0,0:04:45.67,0:04:48.37,*Default,,0000,0000,0000,,{My Eight-Six turned into an Eight-Five ? !}¡¿Mi Hachi-Roku se ha\nconvertido en un Hachi-Go?! -Dialogue: Marked=0,0:04:48.97,0:04:51.70,*Default,,0000,0000,0000,,{\c&HFFFFFF&}Tomé el auto prestado,\nte dejé un sustituto. -Dialogue: Marked=0,0:05:01.52,0:05:04.12,*Default,,0000,0000,0000,,{Takumi,Your dad must be really surprised by now. . .}Ahora mismo tu padre\ndebe estar en shock. -Dialogue: Marked=0,0:00:15.15,0:00:16.30,Default,Voice,0000,0000,0000,,Otani-san... -Dialogue: Marked=0,0:00:16.93,0:00:18.17,Default,,0000,0000,0000,,Otani-san... -Dialogue: Marked=0,0:00:18.00,0:00:21.18,Signs,Sign,0000,0000,0000,,{\a6}Sixth Grade Camellia Class -Dialogue: Marked=0,0:00:18.58,0:00:19.80,Default,Voice,0000,0000,0000,,Otani-san... -Dialogue: Marked=0,0:00:20.45,0:00:21.64,Default,,0000,0000,0000,,Otani-san... -Dialogue: Marked=0,0:00:21.38,0:00:25.88,Signs,Chalkboard,0000,0000,0000,,{\a6}Alien Counter-Measure Officer -Dialogue: Marked=0,0:00:22.55,0:00:23.91,Default,Voice,0000,0000,0000,,Otani-san... -Dialogue: Marked=0,0:00:24.35,0:00:25.46,Default,,0000,0000,0000,,Furukawa-san... -Dialogue: Marked=0,0:00:26.05,0:00:27.23,Signs,Board,0000,0000,0000,,{\a6}Otani Furukawa Tatsuta -Dialogue: Marked=0,0:01:04.66,0:01:05.87,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k15}Fu{\k22}tsu{\k11}u {\k25}ja {\k13}na{\k39}i -Dialogue: Marked=0,0:01:05.93,0:01:07.43,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k30}A{\k30}sa {\k17}ga {\k23}ki{\k50}te -Dialogue: Marked=0,0:01:07.60,0:01:10.60,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k27}Na{\k8}i{\k23}fu {\k19}no {\k18}sa{\k32}sa{\k9}t{\k28}ta {\k18}ha{\k9}a{\k28}to {\k18}ga {\k14}u{\k27}zu{\k22}ku -Dialogue: Marked=0,0:01:10.71,0:01:11.99,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k22}Ne{\k21}bo{\k8}u {\k29}shi{\k23}ta{\k25}i -Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,Text,0029,0427,0322,,{\pos(169,215)}Elementary School #9 -Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0030,0279,0371,,{\pos(220,251)}Alien Counter-Measure Officers -Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0398,0209,0038,,{\pos(617,413)}The End -Dialogue: Marked=0,0:25:35.06,0:25:36.67,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(92,470)}{0}{\k25}To{\k43}ki-{\k32}do{\kf61}ki -Dialogue: Marked=0,0:25:36.68,0:25:40.69,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(125,471)}{0}{\k46}Ko{\k27}no {\k46}ka{\k36}ra{\k47}da {\kf200}ga -Dialogue: Marked=0,0:25:45.04,0:25:47.97,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(132,471)}{\k35}Yo{\k28}ro{\k41}ko{\k35}bi {\k28}na {\k26}no {\k100}ka -Dialogue: Marked=0,0:25:47.98,0:25:50.22,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(143,473)}{\k14}Ka{\k20}na{\k26}shi{\k15}mi {\k32}na {\k65}no {\k52}ka -Dialogue: Marked=0,0:25:35.06,0:25:36.67,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Sometimes -Dialogue: Marked=0,0:25:36.68,0:25:40.69,SongED,,0000,0000,0000,,{\fs24\pos(136,522)}Whether this body -Dialogue: Marked=0,0:25:45.04,0:25:47.97,SongED,,0000,0000,0000,,{\fs24\pos(107,520)}Is happiness -Dialogue: Marked=0,0:25:47.98,0:25:50.22,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Or sadness - - - - - +[Script Info] +; Script generated by Aegisub 2.1.7 +; http://www.aegisub.net +ScriptType: v4.00 +Collisions: Normal +PlayResY: 534 +PlayResX: 720 +WrapStyle: 0 +ScaledBorderAndShadow: no +Video File: 01-.mkv +Video Aspect Ratio: 1 +Video Zoom: 8 +Video Position: 36805 +Last Style Storage: Default +Export Encoding: UTF-8 +Export filters: Karaoke template +Title: Alien Nine 01 +Original Script: ? +Original Translation: ? +Original Editing: ? +Original Timing: ? +Synch Point: ? +Script Updated By: lM +Update Details: Kareoke by Pahndamonium + +[V4 Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding +Style: Song (romaji) ED-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,6,30,30,16,0,0 +Style: SongED-furigana,Verdana,15,1393701,8454016,0,16777215,-1,-1,1,1,0,2,30,30,26,0,0 +Style: Song (romaji) OP-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,2,30,30,18,0,0 +Style: SongOP-furigana,Verdana,15,3305768,8454016,0,16777215,-1,0,1,1,0,2,30,30,30,0,0 +Style: Signs-furigana,Arial,14,16777215,65535,0,0,-1,0,1,1,0,2,40,40,28,0,0 +Style: CF2-furigana,Verdana,14,16777215,16777215,0,0,-1,-1,1,1,0,2,30,30,30,0,0 +Style: Default-furigana,Verdana,14,16777215,65535,0,0,-1,0,1,1,0,2,30,30,28,0,0 +Style: Default,Verdana,28,16777215,65535,0,0,-1,0,1,2,0,2,30,30,28,0,0 +Style: CF2,Verdana,28,16777215,16777215,0,0,-1,-1,1,2,0,2,30,30,30,0,0 +Style: Signs,Arial,28,16777215,65535,0,0,-1,0,1,2,0,2,40,40,28,0,0 +Style: SongOP,Verdana,30,3305768,8454016,0,16777215,-1,0,1,2,0,2,30,30,30,0,0 +Style: Song (romaji) OP,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,2,30,30,18,0,0 +Style: SongED,Verdana,30,1393701,8454016,0,16777215,-1,-1,1,2,0,2,30,30,26,0,0 +Style: Song (romaji) ED,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,6,30,30,16,0,0 + +[Events] +Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: Marked=0,0:00:02.42,0:00:03.00,*Default,,0000,0000 ,0000,,{\fnComic Sans MS\c&HFF80FF&}All Japan Boys Soccer Tournament Opens! +Dialogue: Marked=0,0:00:59.60,0:01:00.60,Default,NTP,0000,0000,0000,,Tak tady jsi... +Dialogue: Marked=0,0:01:00.81,0:01:01.39,Default,NTP,0000,0000,0000,,Ahoj. +Dialogue: Marked=0,0:01:01.52,0:01:03.98,Default,NTP,0000,0000,0000,,Pojď se mnou. +Dialogue: Marked=0,0:01:19.71,0:01:30.26,*Default,SONG,0000,0000,0092,,When you hear the bell of Chirin,... +Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0000,,YASASHII MATSUGE WO HOHOEMI WO +Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0092,,...recall those soft lashes and that gentle smile. +Dialogue: Marked=0,0:01:40.46,0:01:50.72,*Default,SONG,0000,0000,0000,,CHIRIN NO SUZU DE OMOIDASU +Dialogue: Marked=0,0:04:45.67,0:04:48.37,*Default,,0000,0000,0000,,{My Eight-Six turned into an Eight-Five ? !}¡¿Mi Hachi-Roku se ha\nconvertido en un Hachi-Go?! +Dialogue: Marked=0,0:04:48.97,0:04:51.70,*Default,,0000,0000,0000,,{\c&HFFFFFF&}Tomé el auto prestado,\nte dejé un sustituto. +Dialogue: Marked=0,0:05:01.52,0:05:04.12,*Default,,0000,0000,0000,,{Takumi,Your dad must be really surprised by now. . .}Ahora mismo tu padre\ndebe estar en shock. +Dialogue: Marked=0,0:00:15.15,0:00:16.30,Default,Voice,0000,0000,0000,,Otani-san... +Dialogue: Marked=0,0:00:16.93,0:00:18.17,Default,,0000,0000,0000,,Otani-san... +Dialogue: Marked=0,0:00:18.00,0:00:21.18,Signs,Sign,0000,0000,0000,,{\a6}Sixth Grade Camellia Class +Dialogue: Marked=0,0:00:18.58,0:00:19.80,Default,Voice,0000,0000,0000,,Otani-san... +Dialogue: Marked=0,0:00:20.45,0:00:21.64,Default,,0000,0000,0000,,Otani-san... +Dialogue: Marked=0,0:00:21.38,0:00:25.88,Signs,Chalkboard,0000,0000,0000,,{\a6}Alien Counter-Measure Officer +Dialogue: Marked=0,0:00:22.55,0:00:23.91,Default,Voice,0000,0000,0000,,Otani-san... +Dialogue: Marked=0,0:00:24.35,0:00:25.46,Default,,0000,0000,0000,,Furukawa-san... +Dialogue: Marked=0,0:00:26.05,0:00:27.23,Signs,Board,0000,0000,0000,,{\a6}Otani Furukawa Tatsuta +Dialogue: Marked=0,0:01:04.66,0:01:05.87,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k15}Fu{\k22}tsu{\k11}u {\k25}ja {\k13}na{\k39}i +Dialogue: Marked=0,0:01:05.93,0:01:07.43,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k30}A{\k30}sa {\k17}ga {\k23}ki{\k50}te +Dialogue: Marked=0,0:01:07.60,0:01:10.60,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k27}Na{\k8}i{\k23}fu {\k19}no {\k18}sa{\k32}sa{\k9}t{\k28}ta {\k18}ha{\k9}a{\k28}to {\k18}ga {\k14}u{\k27}zu{\k22}ku +Dialogue: Marked=0,0:01:10.71,0:01:11.99,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k22}Ne{\k21}bo{\k8}u {\k29}shi{\k23}ta{\k25}i +Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,Text,0029,0427,0322,,{\pos(169,215)}Elementary School #9 +Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0030,0279,0371,,{\pos(220,251)}Alien Counter-Measure Officers +Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0398,0209,0038,,{\pos(617,413)}The End +Dialogue: Marked=0,0:25:35.06,0:25:36.67,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(92,470)}{0}{\k25}To{\k43}ki-{\k32}do{\kf61}ki +Dialogue: Marked=0,0:25:36.68,0:25:40.69,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(125,471)}{0}{\k46}Ko{\k27}no {\k46}ka{\k36}ra{\k47}da {\kf200}ga +Dialogue: Marked=0,0:25:45.04,0:25:47.97,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(132,471)}{\k35}Yo{\k28}ro{\k41}ko{\k35}bi {\k28}na {\k26}no {\k100}ka +Dialogue: Marked=0,0:25:47.98,0:25:50.22,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(143,473)}{\k14}Ka{\k20}na{\k26}shi{\k15}mi {\k32}na {\k65}no {\k52}ka +Dialogue: Marked=0,0:25:35.06,0:25:36.67,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Sometimes +Dialogue: Marked=0,0:25:36.68,0:25:40.69,SongED,,0000,0000,0000,,{\fs24\pos(136,522)}Whether this body +Dialogue: Marked=0,0:25:45.04,0:25:47.97,SongED,,0000,0000,0000,,{\fs24\pos(107,520)}Is happiness +Dialogue: Marked=0,0:25:47.98,0:25:50.22,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Or sadness + + + + + diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-stl b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-stl index cde33cd..5c74850 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-stl +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-stl @@ -1,29 +1,29 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:31.02,0:00:33.00,Default,,0,0,0,,Hello, my name is Axel Kornmesser. -Dialogue: 0,0:00:45.02,0:00:49.13,Default,,0,0,0,,It is always a pleasure to work with ESA astronomers. -Dialogue: 0,0:00:49.13,0:00:52.03,Default,,0,0,0,,The "Eyes on The Skies" documentary -Dialogue: 0,0:00:52.03,0:00:55.09,Default,,0,0,0,,was our second collaboration -Dialogue: 0,0:00:55.09,0:00:58.07,Default,,0,0,0,,after a great \Nexperience in 2005, -Dialogue: 0,0:00:58.07,0:00:59.20,Default,,0,0,0,,when \Nwe did the story about the -Dialogue: 0,0:00:59.20,0:01:04.01,Default,,0,0,0,,Hubble Telescope "15 Years of Discovery". -Dialogue: 0,0:01:04.16,0:01:07.04,Default,,0,0,0,,It was a lot of fun again. -Dialogue: 0,0:01:15.04,0:01:18.16,Default,,0,0,0,,We usually \N don't get the final film \Nbefore we start composing -Dialogue: 0,0:01:18.21,0:01:22.02,Default,,0,0,0,,We had a script and many details about the story, -Dialogue: 0,0:01:22.10,0:01:26.08,Default,,0,0,0,,and so we worked\N in parallel \Nin the movie production -Dialogue: 0,0:01:27.04,0:01:30.17,Default,,0,0,0,,The largest part of \N the soundtrack \Nwas done without seeing a movie -Dialogue: 0,0:01:30.17,0:01:36.06,Default,,0,0,0,,It was no problem, but very inspiring \Nand a free working process. -Dialogue: 0,0:02:08.13,0:02:10.23,Default,,0,0,0,,Galileo's theme is one of my favourites. -Dialogue: 0,0:02:10.23,0:02:14.10,Default,,0,0,0,,We did a lot of different versions \Nabout the central theme. -Dialogue: 0,0:02:14.10,0:02:18.02,Default,,0,0,0,,For the 17th century \N we used a nice harpsichord -Dialogue: 0,0:02:19.05,0:02:22.09,Default,,0,0,0,,and so we landed directly into Galileo's time. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:31.02,0:00:33.00,Default,,0,0,0,,Hello, my name is Axel Kornmesser. +Dialogue: 0,0:00:45.02,0:00:49.13,Default,,0,0,0,,It is always a pleasure to work with ESA astronomers. +Dialogue: 0,0:00:49.13,0:00:52.03,Default,,0,0,0,,The "Eyes on The Skies" documentary +Dialogue: 0,0:00:52.03,0:00:55.09,Default,,0,0,0,,was our second collaboration +Dialogue: 0,0:00:55.09,0:00:58.07,Default,,0,0,0,,after a great \Nexperience in 2005, +Dialogue: 0,0:00:58.07,0:00:59.20,Default,,0,0,0,,when \Nwe did the story about the +Dialogue: 0,0:00:59.20,0:01:04.01,Default,,0,0,0,,Hubble Telescope "15 Years of Discovery". +Dialogue: 0,0:01:04.16,0:01:07.04,Default,,0,0,0,,It was a lot of fun again. +Dialogue: 0,0:01:15.04,0:01:18.16,Default,,0,0,0,,We usually \N don't get the final film \Nbefore we start composing +Dialogue: 0,0:01:18.21,0:01:22.02,Default,,0,0,0,,We had a script and many details about the story, +Dialogue: 0,0:01:22.10,0:01:26.08,Default,,0,0,0,,and so we worked\N in parallel \Nin the movie production +Dialogue: 0,0:01:27.04,0:01:30.17,Default,,0,0,0,,The largest part of \N the soundtrack \Nwas done without seeing a movie +Dialogue: 0,0:01:30.17,0:01:36.06,Default,,0,0,0,,It was no problem, but very inspiring \Nand a free working process. +Dialogue: 0,0:02:08.13,0:02:10.23,Default,,0,0,0,,Galileo's theme is one of my favourites. +Dialogue: 0,0:02:10.23,0:02:14.10,Default,,0,0,0,,We did a lot of different versions \Nabout the central theme. +Dialogue: 0,0:02:14.10,0:02:18.02,Default,,0,0,0,,For the 17th century \N we used a nice harpsichord +Dialogue: 0,0:02:19.05,0:02:22.09,Default,,0,0,0,,and so we landed directly into Galileo's time. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc index 7f35ae9..5bc4ff1 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc @@ -1,6 +1,6 @@ 1 00:00:00,970 --> 00:00:02,540 -- Test 1. +- Test 1. - Test 2. 2 @@ -9,6 +9,6 @@ 3 00:00:05,850 --> 00:00:08,140 -- Test 4. +- Test 4. - Test 5. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer index 19944f6..363b2e3 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer @@ -1,15 +1,15 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:01:00.10,0:02:00.20,Default,,0,0,0,,Hello.\NWorld! -Dialogue: 0,0:02:00.30,0:03:00.40,Default,,0,0,0,,\Nfoo\Nbar\Nbla\Nmixed with br -Dialogue: 0,0:03:04.12,0:03:10.20,Default,,0,0,0,,Another event. +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:01:00.10,0:02:00.20,Default,,0,0,0,,Hello.\NWorld! +Dialogue: 0,0:02:00.30,0:03:00.40,Default,,0,0,0,,\Nfoo\Nbar\Nbla\Nmixed with br +Dialogue: 0,0:03:04.12,0:03:10.20,Default,,0,0,0,,Another event. diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer1 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer1 index a75406b..d510ce4 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer1 +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subviewer1 @@ -1,22 +1,22 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:03:45.00,0:03:48.00,Default,,0,0,0,,- ToIerábiIis?\N- Azt jeIenti: tűrhető. -Dialogue: 0,0:03:48.00,0:03:51.00,Default,,0,0,0,,Tudom, mit jeIent. Megnézhetem? -Dialogue: 0,0:03:52.00,0:03:54.00,Default,,0,0,0,,TiszteIt bírónő. -Dialogue: 0,0:03:57.00,0:04:00.00,Default,,0,0,0,,KépzeIje magát\Na környékbeIi gyermekek heIyébe. -Dialogue: 0,0:04:01.00,0:04:05.00,Default,,0,0,0,,Naphosszat monoton, döngöIő zaj\Nszaggatja a dobhártyájukat. -Dialogue: 0,0:04:05.00,0:04:10.00,Default,,0,0,0,,Ahogy egyre föIébük tornyosuI,\Nrájuk veti sötét árnyékát. -Dialogue: 0,0:04:10.00,0:04:15.00,Default,,0,0,0,,Ez a feIhőkarcoIó, az emberi\Nmohóság újabb emIékműve. -Dialogue: 0,1:50:38.00,1:50:41.00,Default,,0,0,0,,készen áIIok. -Dialogue: 0,1:51:00.00,1:51:03.00,Default,,0,0,0,,Joe ... Miguel keres. -Dialogue: 0,2:00:18.00,9:59:59.99,Default,,0,0,0,,Magyar szöveg: Nikowvitz Oszkár +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:03:45.00,0:03:48.00,Default,,0,0,0,,- ToIerábiIis?\N- Azt jeIenti: tűrhető. +Dialogue: 0,0:03:48.00,0:03:51.00,Default,,0,0,0,,Tudom, mit jeIent. Megnézhetem? +Dialogue: 0,0:03:52.00,0:03:54.00,Default,,0,0,0,,TiszteIt bírónő. +Dialogue: 0,0:03:57.00,0:04:00.00,Default,,0,0,0,,KépzeIje magát\Na környékbeIi gyermekek heIyébe. +Dialogue: 0,0:04:01.00,0:04:05.00,Default,,0,0,0,,Naphosszat monoton, döngöIő zaj\Nszaggatja a dobhártyájukat. +Dialogue: 0,0:04:05.00,0:04:10.00,Default,,0,0,0,,Ahogy egyre föIébük tornyosuI,\Nrájuk veti sötét árnyékát. +Dialogue: 0,0:04:10.00,0:04:15.00,Default,,0,0,0,,Ez a feIhőkarcoIó, az emberi\Nmohóság újabb emIékműve. +Dialogue: 0,1:50:38.00,1:50:41.00,Default,,0,0,0,,készen áIIok. +Dialogue: 0,1:51:00.00,1:51:03.00,Default,,0,0,0,,Joe ... Miguel keres. +Dialogue: 0,2:00:18.00,9:59:59.99,Default,,0,0,0,,Magyar szöveg: Nikowvitz Oszkár diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc index f7d82ce..58a1c44 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc @@ -4,11 +4,11 @@ Don't show this text it may be used to insert hidden data 2 00:00:01,500 --> 00:00:04,500 -SubRip subtitles capability tester 1.3o by ale5000 -Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others -This text should be blue -This text should be red -This text should be black +SubRip subtitles capability tester 1.3o by ale5000 +Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others +This text should be blue +This text should be red +This text should be black If you see this with the normal font, the player don't (fully) support font face 3 @@ -17,43 +17,43 @@ Hidden 4 00:00:04,501 --> 00:00:07,500 -This text should be small -This text should be normal +This text should be small +This text should be normal This text should be big 5 00:00:07,501 --> 00:00:11,500 -This should be an E with an accent: È -日本語 -This text should be bold, italics and underline -This text should be small and green -This text should be small and red +This should be an E with an accent: È +日本語 +This text should be bold, italics and underline +This text should be small and green +This text should be small and red This text should be big and brown 6 00:00:11,501 --> 00:00:14,500 -This line should be bold -This line should be italics -This line should be underline -This line should be strikethrough -Both lines +This line should be bold +This line should be italics +This line should be underline +This line should be strikethrough +Both lines should be underline 7 00:00:14,501 --> 00:00:17,500 -> -It would be a good thing to -hide invalid html tags that are closed and show the text in them -but show un-closed invalid html tags -Show not opened tags +> +It would be a good thing to +hide invalid html tags that are closed and show the text in them +but show un-closed invalid html tags +Show not opened tags < 8 00:00:17,501 --> 00:00:20,500 -and also -hide invalid html tags with parameters that are closed and show the text in them -but show un-closed invalid html tags -This text should be showed underlined without problems also: 2<3,5>1,4<6 +and also +hide invalid html tags with parameters that are closed and show the text in them +but show un-closed invalid html tags +This text should be showed underlined without problems also: 2<3,5>1,4<6 This shouldn't be underlined 9 @@ -66,49 +66,49 @@ This text should NOT be in the normal position 11 00:00:22,501 --> 00:00:24,500 -Implementation is the same of the ASS tag -This text should be at the +Implementation is the same of the ASS tag +This text should be at the top and horizontally centered 12 00:00:22,501 --> 00:00:24,500 -This text should be at the +This text should be at the middle and horizontally centered 13 00:00:22,501 --> 00:00:24,500 -This text should be at the +This text should be at the bottom and horizontally centered 14 00:00:24,501 --> 00:00:26,500 -This text should be at the +This text should be at the top and horizontally at the left 15 00:00:24,501 --> 00:00:26,500 -This text should be at the -middle and horizontally at the left +This text should be at the +middle and horizontally at the left (The second position must be ignored) 16 00:00:24,501 --> 00:00:26,500 -This text should be at the +This text should be at the bottom and horizontally at the left 17 00:00:26,501 --> 00:00:28,500 -This text should be at the +This text should be at the top and horizontally at the right 18 00:00:26,501 --> 00:00:28,500 -This text should be at the +This text should be at the middle and horizontally at the right 19 00:00:26,501 --> 00:00:28,500 -This text should be at the +This text should be at the bottom and horizontally at the right 20 @@ -137,7 +137,7 @@ Fifth, it should replace third 26 00:00:45,501 --> 00:00:50,500 -Sixth, it shouldn't be +Sixth, it shouldn't be showed overlapped 27 @@ -150,64 +150,64 @@ text 2 29 00:00:52,501 --> 00:00:54,500 -Hide these tags: -also hide these tags: +Hide these tags: +also hide these tags: but show this: {normal text} 30 00:00:54,501 --> 00:01:00,500 - -\ N is a forced line break -\ h is a hard space -Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed. + +\ N is a forced line break +\ h is a hard space +Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed. The\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D 31 00:00:54,501 --> 00:00:56,500 - -\h\h\h\h\hA (05 hard spaces followed by a letter) -A (Normal spaces followed by a letter) + +\h\h\h\h\hA (05 hard spaces followed by a letter) +A (Normal spaces followed by a letter) A (No hard spaces followed by a letter) 32 00:00:56,501 --> 00:00:58,500 -\h\h\h\h\hA (05 hard spaces followed by a letter) -A (Normal spaces followed by a letter) -A (No hard spaces followed by a letter) +\h\h\h\h\hA (05 hard spaces followed by a letter) +A (Normal spaces followed by a letter) +A (No hard spaces followed by a letter) Show this: \TEST and this: \-) 33 00:00:58,501 --> 00:01:00,500 - -A letter followed by 05 hard spaces: A\h\h\h\h\h -A letter followed by normal spaces: A -A letter followed by no hard spaces: A -05 hard spaces between letters: A\h\h\h\h\hA -5 normal spaces between letters: A A - + +A letter followed by 05 hard spaces: A\h\h\h\h\h +A letter followed by normal spaces: A +A letter followed by no hard spaces: A +05 hard spaces between letters: A\h\h\h\h\hA +5 normal spaces between letters: A A + ^--Forced line break 34 00:01:00,501 --> 00:01:02,500 -Both line should be strikethrough, -yes. -Correctly closed tags +Both line should be strikethrough, +yes. +Correctly closed tags should be hidden. 35 00:01:02,501 --> 00:01:04,500 -It shouldn't be strikethrough, -not opened tag showed as text. +It shouldn't be strikethrough, +not opened tag showed as text. Not opened tag showed as text. 36 00:01:04,501 --> 00:01:06,500 -Three lines should be strikethrough, -yes. +Three lines should be strikethrough, +yes. Not closed tags showed as text 37 00:01:06,501 --> 00:01:08,500 -Both line should be strikethrough but +Both line should be strikethrough but the wrong closing tag should be showed diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-vplayer b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-vplayer index 6e804f6..7bdbe6b 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-vplayer +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-vplayer @@ -1,15 +1,15 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.12,0:00:23.51,Default,,0,0,0,,Hello -Dialogue: 0,0:00:23.51,0:01:02.05,Default,,0,0,0,,World -Dialogue: 0,0:01:02.05,9:59:59.99,Default,,0,0,0,,!\Nnewline +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.12,0:00:23.51,Default,,0,0,0,,Hello +Dialogue: 0,0:00:23.51,0:01:02.05,Default,,0,0,0,,World +Dialogue: 0,0:01:02.05,9:59:59.99,Default,,0,0,0,,!\Nnewline diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt index 8c63a90..97222ec 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt @@ -1,27 +1,27 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:11.00,0:00:13.00,Default,,0,0,0,,We are in New York City\NRandom line added -Dialogue: 0,0:00:13.00,0:00:16.00,Default,,0,0,0,,We're actually at the Lucern Hotel, just down the street -Dialogue: 0,0:00:16.00,0:00:18.00,Default,,0,0,0,,from the American Museum of Natural History -Dialogue: 0,0:00:18.00,0:00:20.00,Default,,0,0,0,,And with me is Neil deGrasse Tyson -Dialogue: 0,0:00:20.00,0:00:22.00,Default,,0,0,0,,Astrophysicist, Director of the Hayden Planetarium -Dialogue: 0,0:00:22.00,0:00:24.00,Default,,0,0,0,,at the AMNH. -Dialogue: 0,0:00:24.00,0:00:26.00,Default,,0,0,0,,Thank you for walking down here. -Dialogue: 0,0:00:27.00,0:00:30.00,Default,,0,0,0,,And I want to do a follow-up on the last conversation we did.\Nmultiple lines\Nagain -Dialogue: 0,0:00:30.00,0:00:31.50,Default,,0,0,0,,When we e-mailed— -Dialogue: 0,0:00:30.50,0:00:32.50,Default,,0,0,0,,Didn't we {\b1}talk {\i1}about\N{\i0} enough{\b0} in that conversation? \{I'm not an ASS comment\} -Dialogue: 0,0:00:32.00,0:00:35.50,Default,,0,0,0,,No! No no no no; 'cos 'cos obviously 'cos -Dialogue: 0,0:00:32.50,0:00:33.50,Default,,0,0,0,,{\i1}Laughs{\i0} -Dialogue: 0,0:00:35.50,0:00:38.00,Default,,0,0,0,,You know I'm so excited my glasses are falling off here. -Dialogue: 0,0:00:50.00,0:00:51.13,Default,,0,0,0,,This event and the following\None have CLRF -Dialogue: 0,0:59:00.12,1:23:45.68,Default,,0,0,0,,Obiwan Kenobi +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:11.00,0:00:13.00,Default,,0,0,0,,We are in New York City\NRandom line added +Dialogue: 0,0:00:13.00,0:00:16.00,Default,,0,0,0,,We're actually at the Lucern Hotel, just down the street +Dialogue: 0,0:00:16.00,0:00:18.00,Default,,0,0,0,,from the American Museum of Natural History +Dialogue: 0,0:00:18.00,0:00:20.00,Default,,0,0,0,,And with me is Neil deGrasse Tyson +Dialogue: 0,0:00:20.00,0:00:22.00,Default,,0,0,0,,Astrophysicist, Director of the Hayden Planetarium +Dialogue: 0,0:00:22.00,0:00:24.00,Default,,0,0,0,,at the AMNH. +Dialogue: 0,0:00:24.00,0:00:26.00,Default,,0,0,0,,Thank you for walking down here. +Dialogue: 0,0:00:27.00,0:00:30.00,Default,,0,0,0,,And I want to do a follow-up on the last conversation we did.\Nmultiple lines\Nagain +Dialogue: 0,0:00:30.00,0:00:31.50,Default,,0,0,0,,When we e-mailed— +Dialogue: 0,0:00:30.50,0:00:32.50,Default,,0,0,0,,Didn't we {\b1}talk {\i1}about\N{\i0} enough{\b0} in that conversation? \{I'm not an ASS comment\} +Dialogue: 0,0:00:32.00,0:00:35.50,Default,,0,0,0,,No! No no no no; 'cos 'cos obviously 'cos +Dialogue: 0,0:00:32.50,0:00:33.50,Default,,0,0,0,,{\i1}Laughs{\i0} +Dialogue: 0,0:00:35.50,0:00:38.00,Default,,0,0,0,,You know I'm so excited my glasses are falling off here. +Dialogue: 0,0:00:50.00,0:00:51.13,Default,,0,0,0,,This event and the following\None have CLRF +Dialogue: 0,0:59:00.12,1:23:45.68,Default,,0,0,0,,Obiwan Kenobi diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt2 b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt2 index 9f7827d..5c42823 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt2 +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-webvtt2 @@ -1,24 +1,24 @@ -[Script Info] -; Script generated by FFmpeg/Lavc -ScriptType: v4.00+ -PlayResX: 384 -PlayResY: 288 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:20.00,Default,,0,0,0,,Hi, my name is Fred -Dialogue: 0,0:00:02.50,0:00:22.50,Default,,0,0,0,,Hi, I’m Bill -Dialogue: 0,0:00:05.00,0:00:25.00,Default,,0,0,0,,Would you like to get a coffee? -Dialogue: 0,0:00:07.50,0:00:27.50,Default,,0,0,0,,Sure! I’ve only had one today. -Dialogue: 0,0:00:10.00,0:00:30.00,Default,,0,0,0,,This is my fourth! -Dialogue: 0,0:00:12.50,0:00:32.50,Default,,0,0,0,,OK, let’s go. -Dialogue: 0,0:00:38.00,0:00:43.00,Default,,0,0,0,,I want to 愛あい love you\NThat's not proper English! -Dialogue: 0,0:00:43.00,0:00:46.00,Default,,0,0,0,,{\i1}キツネ{\i0}じゃない　キツネじゃない\N乙女おとめは -Dialogue: 0,0:00:50.00,0:00:55.00,Default,,0,0,0,,Some time ago in a rather distant place.... -Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: 123456\NAscending: 123456 -Dialogue: 0,0:01:00.00,0:01:05.00,Default,,0,0,0,,>> Never gonna give you up Never gonna let you down\NNever\hgonna\hrun\haround & desert\hyou -Dialogue: 0,0:55:00.00,1:00:00.00,Default,,0,0,0,,Transcrit par Célestes™ +[Script Info] +; Script generated by FFmpeg/Lavc +ScriptType: v4.00+ +PlayResX: 384 +PlayResY: 288 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:20.00,Default,,0,0,0,,Hi, my name is Fred +Dialogue: 0,0:00:02.50,0:00:22.50,Default,,0,0,0,,Hi, I’m Bill +Dialogue: 0,0:00:05.00,0:00:25.00,Default,,0,0,0,,Would you like to get a coffee? +Dialogue: 0,0:00:07.50,0:00:27.50,Default,,0,0,0,,Sure! I’ve only had one today. +Dialogue: 0,0:00:10.00,0:00:30.00,Default,,0,0,0,,This is my fourth! +Dialogue: 0,0:00:12.50,0:00:32.50,Default,,0,0,0,,OK, let’s go. +Dialogue: 0,0:00:38.00,0:00:43.00,Default,,0,0,0,,I want to 愛あい love you\NThat's not proper English! +Dialogue: 0,0:00:43.00,0:00:46.00,Default,,0,0,0,,{\i1}キツネ{\i0}じゃない　キツネじゃない\N乙女おとめは +Dialogue: 0,0:00:50.00,0:00:55.00,Default,,0,0,0,,Some time ago in a rather distant place.... +Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: 123456\NAscending: 123456 +Dialogue: 0,0:01:00.00,0:01:05.00,Default,,0,0,0,,>> Never gonna give you up Never gonna let you down\NNever\hgonna\hrun\haround & desert\hyou +Dialogue: 0,0:55:00.00,1:00:00.00,Default,,0,0,0,,Transcrit par Célestes™ diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/regression-funcs.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/regression-funcs.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/bisect-create b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/bisect-create old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/clean-diff b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/clean-diff old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/dvd2concat b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/dvd2concat old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/gen-rc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/gen-rc old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/libav-merge-next-commit b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/libav-merge-next-commit old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/make_chlayout_test b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/make_chlayout_test old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/missing_codec_desc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/missing_codec_desc old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/murge b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/murge old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/normalize.py b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/normalize.py old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/patcheck b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/patcheck old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/plotframes b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/plotframes old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/unwrap-diff b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/unwrap-diff old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/zmqshell.py b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tools/zmqshell.py old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/version.sh b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/version.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/getopt.c b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/getopt.c old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/os2threads.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/os2threads.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.c b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.c old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.d b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.d old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.o b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/strtod.o old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/va_copy.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/va_copy.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/w32pthreads.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/compat/w32pthreads.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavdevice/avdevice.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavdevice/avdevice.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavdevice/version.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavdevice/version.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavresample/avresample.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavresample/avresample.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavresample/version.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libavresample/version.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libpostproc/postprocess.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libpostproc/postprocess.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libpostproc/version.h b/SmallVideoRecord2/SmallVideoLib2/src/main/cpp/include/libpostproc/version.h old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libfdk-aac.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/arm64-v8a/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libfdk-aac.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi-v7a/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libfdk-aac.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/armeabi/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libfdk-aac.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavcodec.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavfilter.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavformat.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavutil.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libfdk-aac.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libswresample.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libswscale.so b/SmallVideoRecord2/SmallVideoLib2/src/main/jniLibs/x86_64/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libavcodec.so b/SmallVideoRecord2/all_lib/arm64-v8a/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libavfilter.so b/SmallVideoRecord2/all_lib/arm64-v8a/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libavformat.so b/SmallVideoRecord2/all_lib/arm64-v8a/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libavutil.so b/SmallVideoRecord2/all_lib/arm64-v8a/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libfdk-aac.so b/SmallVideoRecord2/all_lib/arm64-v8a/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libjx_ffmpeg_jni.so b/SmallVideoRecord2/all_lib/arm64-v8a/libjx_ffmpeg_jni.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libswresample.so b/SmallVideoRecord2/all_lib/arm64-v8a/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/arm64-v8a/libswscale.so b/SmallVideoRecord2/all_lib/arm64-v8a/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libavcodec.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libavfilter.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libavformat.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libavutil.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libfdk-aac.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libjx_ffmpeg_jni.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libjx_ffmpeg_jni.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libswresample.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi-v7a/libswscale.so b/SmallVideoRecord2/all_lib/armeabi-v7a/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libavcodec.so b/SmallVideoRecord2/all_lib/armeabi/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libavfilter.so b/SmallVideoRecord2/all_lib/armeabi/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libavformat.so b/SmallVideoRecord2/all_lib/armeabi/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libavutil.so b/SmallVideoRecord2/all_lib/armeabi/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libfdk-aac.so b/SmallVideoRecord2/all_lib/armeabi/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libjx_ffmpeg_jni.so b/SmallVideoRecord2/all_lib/armeabi/libjx_ffmpeg_jni.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libswresample.so b/SmallVideoRecord2/all_lib/armeabi/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/armeabi/libswscale.so b/SmallVideoRecord2/all_lib/armeabi/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libavcodec.so b/SmallVideoRecord2/all_lib/x86/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libavfilter.so b/SmallVideoRecord2/all_lib/x86/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libavformat.so b/SmallVideoRecord2/all_lib/x86/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libavutil.so b/SmallVideoRecord2/all_lib/x86/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libfdk-aac.so b/SmallVideoRecord2/all_lib/x86/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libjx_ffmpeg_jni.so b/SmallVideoRecord2/all_lib/x86/libjx_ffmpeg_jni.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libswresample.so b/SmallVideoRecord2/all_lib/x86/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86/libswscale.so b/SmallVideoRecord2/all_lib/x86/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libavcodec.so b/SmallVideoRecord2/all_lib/x86_64/libavcodec.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libavfilter.so b/SmallVideoRecord2/all_lib/x86_64/libavfilter.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libavformat.so b/SmallVideoRecord2/all_lib/x86_64/libavformat.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libavutil.so b/SmallVideoRecord2/all_lib/x86_64/libavutil.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libfdk-aac.so b/SmallVideoRecord2/all_lib/x86_64/libfdk-aac.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libjx_ffmpeg_jni.so b/SmallVideoRecord2/all_lib/x86_64/libjx_ffmpeg_jni.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libswresample.so b/SmallVideoRecord2/all_lib/x86_64/libswresample.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/all_lib/x86_64/libswscale.so b/SmallVideoRecord2/all_lib/x86_64/libswscale.so old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/build.gradle b/SmallVideoRecord2/build.gradle index e8d1d78..23ac0a4 100644 --- a/SmallVideoRecord2/build.gradle +++ b/SmallVideoRecord2/build.gradle @@ -2,12 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' - classpath 'com.novoda:bintray-release:0.3.4' - + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } @@ -23,4 +24,4 @@ task clean(type: Delete) { delete rootProject.buildDir } -tasks.getByPath(":SmallVideoLib2:mavenAndroidJavadocs").enabled = false \ No newline at end of file +//tasks.getByPath(":SmallVideoLib2:mavenAndroidJavadocs").enabled = false \ No newline at end of file diff --git a/SmallVideoRecord2/copy_so.sh b/SmallVideoRecord2/copy_so.sh old mode 100755 new mode 100644 diff --git a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372ae..0000000 Binary files a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties index 46a7f09..d9be5aa 100644 --- a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties +++ b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/SmallVideoRecord2/gradlew.bat b/SmallVideoRecord2/gradlew.bat index aec9973..8a0b282 100644 --- a/SmallVideoRecord2/gradlew.bat +++ b/SmallVideoRecord2/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/SmallVideoRecord2/sample/build.gradle b/SmallVideoRecord2/sample/build.gradle index cbb6ddf..a935c2a 100644 --- a/SmallVideoRecord2/sample/build.gradle +++ b/SmallVideoRecord2/sample/build.gradle @@ -1,13 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' - + compileSdkVersion 28 + buildToolsVersion '29.0.1' + lintOptions { + abortOnError false + } defaultConfig { applicationId "com.mabeijianxi.smallvideo2" minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 11 versionName "2.0.3" } @@ -16,18 +18,13 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - } - lintOptions { - abortOnError false - } - } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.1.0' -// compile 'com.mabeijianxi:small-video-record2:2.0.0beta@aar' - compile project(':SmallVideoLib2') + testImplementation 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' +// implementation 'com.mabeijianxi:small-video-record2:2.0.0beta@aar' + implementation project(':SmallVideoLib2') }