antonlyap/ffmpeg-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #816 from arthenica/development

Browse Source 
patch native v6.0 releases
This commit is contained in:
Taner Sener 2023-09-03 21:11:07 +01:00 committed by GitHub
commit 6011154472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/README.md
View File

@ -77,7 +77,7 @@ All libraries created by `android.sh` can be found under the `prebuilt` director
}
dependencies {
implementation 'com.arthenica:ffmpeg-kit-full:6.0'
implementation 'com.arthenica:ffmpeg-kit-full:6.0-1'
}
```

22
android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.c
View File

@ -32,6 +32,10 @@
*
* ffmpeg-kit changes by ARTHENICA LTD
*
* 09.2023
* --------------------------------------------------------
* - forward_report method signature accepts pts to calculate the time
*
* 07.2023
* --------------------------------------------------------
* - FFmpeg 6.0 changes migrated
@ -1725,11 +1729,19 @@ static void print_final_stats(int64_t total_size)
}
}
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int seconds, int microseconds, double bitrate, double speed)
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int64_t pts, double bitrate, double speed)
{
// FORWARD DATA
if (report_callback != NULL) {
report_callback(frame_number, fps, quality, total_size, ((double)seconds*1000) + ((double)microseconds)/1000, bitrate, speed);
double milliseconds = 0;
if (pts != AV_NOPTS_VALUE) {
milliseconds = ((double)FFABS64U(pts)) / 1000;
}
if (pts < 0) {
report_callback(frame_number, fps, quality, total_size, 0 - milliseconds, bitrate, speed);
} else {
report_callback(frame_number, fps, quality, total_size, milliseconds, bitrate, speed);
}
}
}
@ -1864,11 +1876,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
speed = pts != AV_NOPTS_VALUE && t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1;
// FFmpegKit forward report
if (pts == AV_NOPTS_VALUE) {
forward_report(frame_number, fps, q, total_size, 0, 0, bitrate, speed);
} else {
forward_report(frame_number, fps, q, total_size, secs, us, bitrate, speed);
}
forward_report(frame_number, fps, q, total_size, pts, bitrate, speed);
if (local_print_stats) {
if (total_size < 0) av_bprintf(&buf, "size=N/A time=");

22
apple/src/fftools_ffmpeg.c
View File

@ -32,6 +32,10 @@
*
* ffmpeg-kit changes by ARTHENICA LTD
*
* 09.2023
* --------------------------------------------------------
* - forward_report method signature accepts pts to calculate the time
*
* 07.2023
* --------------------------------------------------------
* - FFmpeg 6.0 changes migrated
@ -1725,11 +1729,19 @@ static void print_final_stats(int64_t total_size)
}
}
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int seconds, int microseconds, double bitrate, double speed)
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int64_t pts, double bitrate, double speed)
{
// FORWARD DATA
if (report_callback != NULL) {
report_callback(frame_number, fps, quality, total_size, ((double)seconds*1000) + ((double)microseconds)/1000, bitrate, speed);
double milliseconds = 0;
if (pts != AV_NOPTS_VALUE) {
milliseconds = ((double)FFABS64U(pts)) / 1000;
}
if (pts < 0) {
report_callback(frame_number, fps, quality, total_size, 0 - milliseconds, bitrate, speed);
} else {
report_callback(frame_number, fps, quality, total_size, milliseconds, bitrate, speed);
}
}
}
@ -1864,11 +1876,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
speed = pts != AV_NOPTS_VALUE && t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1;
// FFmpegKit forward report
if (pts == AV_NOPTS_VALUE) {
forward_report(frame_number, fps, q, total_size, 0, 0, bitrate, speed);
} else {
forward_report(frame_number, fps, q, total_size, secs, us, bitrate, speed);
}
forward_report(frame_number, fps, q, total_size, pts, bitrate, speed);
if (local_print_stats) {
if (total_size < 0) av_bprintf(&buf, "size=N/A time=");

22
linux/src/fftools_ffmpeg.c
View File

@ -32,6 +32,10 @@
*
* ffmpeg-kit changes by ARTHENICA LTD
*
* 09.2023
* --------------------------------------------------------
* - forward_report method signature accepts pts to calculate the time
*
* 07.2023
* --------------------------------------------------------
* - FFmpeg 6.0 changes migrated
@ -1725,11 +1729,19 @@ static void print_final_stats(int64_t total_size)
}
}
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int seconds, int microseconds, double bitrate, double speed)
static void forward_report(uint64_t frame_number, float fps, float quality, int64_t total_size, int64_t pts, double bitrate, double speed)
{
// FORWARD DATA
if (report_callback != NULL) {
report_callback(frame_number, fps, quality, total_size, ((double)seconds*1000) + ((double)microseconds)/1000, bitrate, speed);
double milliseconds = 0;
if (pts != AV_NOPTS_VALUE) {
milliseconds = ((double)FFABS64U(pts)) / 1000;
}
if (pts < 0) {
report_callback(frame_number, fps, quality, total_size, 0 - milliseconds, bitrate, speed);
} else {
report_callback(frame_number, fps, quality, total_size, milliseconds, bitrate, speed);
}
}
}
@ -1864,11 +1876,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
speed = pts != AV_NOPTS_VALUE && t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1;
// FFmpegKit forward report
if (pts == AV_NOPTS_VALUE) {
forward_report(frame_number, fps, q, total_size, 0, 0, bitrate, speed);
} else {
forward_report(frame_number, fps, q, total_size, secs, us, bitrate, speed);
}
forward_report(frame_number, fps, q, total_size, pts, bitrate, speed);
if (local_print_stats) {
if (total_size < 0) av_bprintf(&buf, "size=N/A time=");

4
scripts/function-android.sh
View File

@ -404,9 +404,9 @@ get_common_linked_libraries() {
# SUPPORTED ON API LEVEL 24 AND LATER
if [[ ${API} -ge 24 ]]; then
echo "-lc -lm -ldl -llog -lcamera2ndk -lmediandk ${COMMON_LIBRARY_PATHS}"
echo "-lc -lm -ldl -llog -landroid -lcamera2ndk -lmediandk ${COMMON_LIBRARY_PATHS}"
else
echo "-lc -lm -ldl -llog ${COMMON_LIBRARY_PATHS}"
echo "-lc -lm -ldl -llog -landroid ${COMMON_LIBRARY_PATHS}"
echo -e "INFO: Building ffmpeg without native camera API which is not supported on Android API Level ${API}\n" 1>>"${BASEDIR}"/build.log 2>&1
fi
;;