k
/
FFmpegAndroid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: change to AudioResample class

Browse Source
pull/221/head
xufuji456 2 years ago
parent 8e4c9d48c2
commit 71c785731b
7 changed files with 150 additions and 88 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      app/src/main/cpp/CMakeLists.txt
  2. 21
      app/src/main/cpp/common_media_jni.cpp
  3. 105
      app/src/main/cpp/ff_audio_resample.cpp
  4. 83
      app/src/main/cpp/ff_audio_resample.h
  5. 8
      app/src/main/cpp/ffmpeg_jni_define.h
  6. 16
      app/src/main/java/com/frank/ffmpeg/CommonMediaHelper.java
  7. 2
      app/src/main/java/com/frank/ffmpeg/VideoPlayer.java

3
app/src/main/cpp/CMakeLists.txt
Unescape View File

@ -43,8 +43,9 @@ add_library( # Sets the name of the library.
metadata/ffmpeg_media_retriever.c metadata/ffmpeg_media_retriever.c
yuv/yuv_converter.cpp yuv/yuv_converter.cpp
media_transcode.cpp media_transcode.cpp
audio_resample.cpp ff_audio_resample.cpp
pcm/pcm_process.cpp pcm/pcm_process.cpp
common_media_jni.cpp
) )
add_library( ffmpeg add_library( ffmpeg

21
app/src/main/cpp/common_media_jni.cpp
Unescape View File

@ -0,0 +1,21 @@
//
// Created by xu fulong on 2022/9/7.
//
#include <jni.h>
#include "ff_audio_resample.h"
COMMON_MEDIA_FUNC(int, audioResample, jstring srcFile, jstring dstFile, int sampleRate) {
const char *src_file = env->GetStringUTFChars(srcFile, JNI_FALSE);
const char *dst_file = env->GetStringUTFChars(dstFile, JNI_FALSE);
auto *audioResample = new FFAudioResample();
int ret = audioResample->resampling(src_file, dst_file, sampleRate);
delete audioResample;
env->ReleaseStringUTFChars(dstFile, dst_file);
env->ReleaseStringUTFChars(srcFile, src_file);
LOGE("AudioResample", "done......");
return ret;
}

105
app/src/main/cpp/audio_resample.cpp → app/src/main/cpp/ff_audio_resample.cpp
Unescape View File

@ -2,46 +2,12 @@
// Created by xu fulong on 2022/7/12. // Created by xu fulong on 2022/7/12.
// //
#include <jni.h> #include "ff_audio_resample.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "libavformat/avformat.h"
#include "libavformat/avio.h"
#include "libavcodec/avcodec.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/frame.h"
#include "libavutil/opt.h"
#include "libswresample/swresample.h"
#ifdef __cplusplus
}
#endif
#include "ffmpeg_jni_define.h"
#define ALOGE(Format, ...) LOGE("audio_resample", Format, ##__VA_ARGS__) #define ALOGE(Format, ...) LOGE("audio_resample", Format, ##__VA_ARGS__)
static int64_t pts = 0;
static AVPacket input_packet;
static AVPacket output_packet;
static AVFrame *input_frame; int FFAudioResample::openInputFile(const char *filename,
static AVFrame *output_frame;
/**
* Open an input file and the required decoder.
*
*/
static int open_input_file(const char *filename,
AVFormatContext **input_format_context, AVFormatContext **input_format_context,
AVCodecContext **input_codec_context) { AVCodecContext **input_codec_context) {
int ret; int ret;
@ -74,11 +40,7 @@ static int open_input_file(const char *filename,
return 0; return 0;
} }
/** int FFAudioResample::openOutputFile(const char *filename,
* Open an output file and the required encoder.
*
*/
static int open_output_file(const char *filename,
int sample_rate, int sample_rate,
AVCodecContext *input_codec_context, AVCodecContext *input_codec_context,
AVFormatContext **output_format_context, AVFormatContext **output_format_context,
@ -142,11 +104,7 @@ static int open_output_file(const char *filename,
return 0; return 0;
} }
/** int FFAudioResample::initResample(AVCodecContext *input_codec_context,
* Initialize the audio resample based on the input and output codec settings.
*
*/
static int init_resampler(AVCodecContext *input_codec_context,
AVCodecContext *output_codec_context, AVCodecContext *output_codec_context,
SwrContext **resample_context) { SwrContext **resample_context) {
*resample_context = swr_alloc_set_opts(nullptr, *resample_context = swr_alloc_set_opts(nullptr,
@ -160,11 +118,7 @@ static int init_resampler(AVCodecContext *input_codec_context,
return swr_init(*resample_context); return swr_init(*resample_context);
} }
/** int FFAudioResample::decodeAudioFrame(AVFrame *frame,
* Decode one audio frame from the input file.
*
*/
static int decode_audio_frame(AVFrame *frame,
AVFormatContext *input_format_context, AVFormatContext *input_format_context,
AVCodecContext *input_codec_context, AVCodecContext *input_codec_context,
int *data_present, int *finished) { int *data_present, int *finished) {
@ -210,13 +164,8 @@ cleanup:
return ret; return ret;
} }
/** int FFAudioResample::initConvertedSamples(uint8_t ***converted_input_samples,
* Initialize a temporary storage for the specified number of audio samples. AVCodecContext *output_codec_context, int frame_size) {
*
*/
static int init_converted_samples(uint8_t ***converted_input_samples,
AVCodecContext *output_codec_context,
int frame_size) {
int ret; int ret;
if (!(*converted_input_samples = (uint8_t **) calloc(output_codec_context->channels, if (!(*converted_input_samples = (uint8_t **) calloc(output_codec_context->channels,
sizeof(**converted_input_samples)))) { sizeof(**converted_input_samples)))) {
@ -241,7 +190,7 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
* it in the FIFO buffer. * it in the FIFO buffer.
* *
*/ */
static int read_decode_convert_and_store(AVAudioFifo *fifo, int FFAudioResample::decodeAndConvert(AVAudioFifo *fifo,
AVFormatContext *input_format_context, AVFormatContext *input_format_context,
AVCodecContext *input_codec_context, AVCodecContext *input_codec_context,
AVCodecContext *output_codec_context, AVCodecContext *output_codec_context,
@ -252,7 +201,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
int ret = AVERROR_EXIT; int ret = AVERROR_EXIT;
/* Decode one frame worth of audio samples. */ /* Decode one frame worth of audio samples. */
if (decode_audio_frame(input_frame, input_format_context, if (decodeAudioFrame(input_frame, input_format_context,
input_codec_context, &data_present, finished)) input_codec_context, &data_present, finished))
goto cleanup; goto cleanup;
if (*finished) { if (*finished) {
@ -264,7 +213,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
int dst_nb_samples = (int) av_rescale_rnd(input_frame->nb_samples, output_codec_context->sample_rate, int dst_nb_samples = (int) av_rescale_rnd(input_frame->nb_samples, output_codec_context->sample_rate,
input_codec_context->sample_rate, AV_ROUND_UP); input_codec_context->sample_rate, AV_ROUND_UP);
if (init_converted_samples(&converted_dst_samples, output_codec_context, dst_nb_samples)) if (initConvertedSamples(&converted_dst_samples, output_codec_context, dst_nb_samples))
goto cleanup; goto cleanup;
ret = swr_convert(resample_context, converted_dst_samples, dst_nb_samples, ret = swr_convert(resample_context, converted_dst_samples, dst_nb_samples,
@ -302,11 +251,7 @@ static int init_output_frame(AVFrame **frame, AVCodecContext *output_codec_conte
return ret; return ret;
} }
/** int FFAudioResample::encodeAudioFrame(AVFrame *frame,
* Encode one frame worth of audio to the output file.
*
*/
static int encode_audio_frame(AVFrame *frame,
AVFormatContext *output_format_context, AVFormatContext *output_format_context,
AVCodecContext *output_codec_context, AVCodecContext *output_codec_context,
int *data_present) { int *data_present) {
@ -357,7 +302,7 @@ cleanup:
* output file. * output file.
* *
*/ */
static int load_encode_and_write(AVAudioFifo *fifo, int FFAudioResample::encodeAndWrite(AVAudioFifo *fifo,
AVFormatContext *output_format_context, AVFormatContext *output_format_context,
AVCodecContext *output_codec_context) { AVCodecContext *output_codec_context) {
int data_written; int data_written;
@ -370,14 +315,14 @@ static int load_encode_and_write(AVAudioFifo *fifo,
return AVERROR_EXIT; return AVERROR_EXIT;
} }
if (encode_audio_frame(output_frame, output_format_context, if (encodeAudioFrame(output_frame, output_format_context,
output_codec_context, &data_written)) { output_codec_context, &data_written)) {
return AVERROR_EXIT; return AVERROR_EXIT;
} }
return 0; return 0;
} }
int resampling(const char *src_file, const char *dst_file, int sampleRate) { int FFAudioResample::resampling(const char *src_file, const char *dst_file, int sampleRate) {
int ret = AVERROR_EXIT; int ret = AVERROR_EXIT;
AVAudioFifo *fifo = nullptr; AVAudioFifo *fifo = nullptr;
SwrContext *resample_context = nullptr; SwrContext *resample_context = nullptr;
@ -387,13 +332,13 @@ int resampling(const char *src_file, const char *dst_file, int sampleRate) {
AVFormatContext *output_format_context = nullptr; AVFormatContext *output_format_context = nullptr;
/* Open the input file for reading. */ /* Open the input file for reading. */
if (open_input_file(src_file, &input_format_context, &input_codec_context)) if (openInputFile(src_file, &input_format_context, &input_codec_context))
goto cleanup; goto cleanup;
/* Open the output file for writing. */ /* Open the output file for writing. */
if (open_output_file(dst_file, sampleRate, input_codec_context, &output_format_context, &output_codec_context)) if (openOutputFile(dst_file, sampleRate, input_codec_context, &output_format_context, &output_codec_context))
goto cleanup; goto cleanup;
/* Initialize the re-sampler to be able to convert audio sample formats. */ /* Initialize the re-sampler to be able to convert audio sample formats. */
if (init_resampler(input_codec_context, output_codec_context, if (initResample(input_codec_context, output_codec_context,
&resample_context)) &resample_context))
goto cleanup; goto cleanup;
/* Initialize the FIFO buffer to store audio samples to be encoded. */ /* Initialize the FIFO buffer to store audio samples to be encoded. */
@ -412,7 +357,7 @@ int resampling(const char *src_file, const char *dst_file, int sampleRate) {
while (av_audio_fifo_size(fifo) < output_frame_size) { while (av_audio_fifo_size(fifo) < output_frame_size) {
/* Decode one frame, convert sample format and put it into the FIFO buffer. */ /* Decode one frame, convert sample format and put it into the FIFO buffer. */
if (read_decode_convert_and_store(fifo, input_format_context, if (decodeAndConvert(fifo, input_format_context,
input_codec_context, input_codec_context,
output_codec_context, output_codec_context,
resample_context, &finished)) resample_context, &finished))
@ -425,7 +370,7 @@ int resampling(const char *src_file, const char *dst_file, int sampleRate) {
/* If we have enough samples for the encoder, we encode them.*/ /* If we have enough samples for the encoder, we encode them.*/
while (av_audio_fifo_size(fifo) >= output_frame_size || while (av_audio_fifo_size(fifo) >= output_frame_size ||
(finished && av_audio_fifo_size(fifo) > 0)) (finished && av_audio_fifo_size(fifo) > 0))
if (load_encode_and_write(fifo, output_format_context, output_codec_context)) if (encodeAndWrite(fifo, output_format_context, output_codec_context))
goto cleanup; goto cleanup;
/* encode all the remaining samples. */ /* encode all the remaining samples. */
@ -433,7 +378,7 @@ int resampling(const char *src_file, const char *dst_file, int sampleRate) {
int data_written; int data_written;
do { do {
data_written = 0; data_written = 0;
if (encode_audio_frame(nullptr, output_format_context, if (encodeAudioFrame(nullptr, output_format_context,
output_codec_context, &data_written)) output_codec_context, &data_written))
goto cleanup; goto cleanup;
} while (data_written); } while (data_written);
@ -468,13 +413,3 @@ cleanup:
return ret; return ret;
} }
extern "C"
VIDEO_PLAYER_FUNC(int, audioResample, jstring srcFile, jstring dstFile, int sampleRate) {
const char *src_file = env->GetStringUTFChars(srcFile, JNI_FALSE);
const char *dst_file = env->GetStringUTFChars(dstFile, JNI_FALSE);
int ret = resampling(src_file, dst_file, sampleRate);
env->ReleaseStringUTFChars(dstFile, dst_file);
env->ReleaseStringUTFChars(srcFile, src_file);
return ret;
}

83
app/src/main/cpp/ff_audio_resample.h
Unescape View File

@ -0,0 +1,83 @@
//
// Created by xu fulong on 2022/9/7.
//
#ifndef FFMPEGANDROID_FF_AUDIO_RESAMPLE_H
#define FFMPEGANDROID_FF_AUDIO_RESAMPLE_H
#include "ffmpeg_jni_define.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "libavformat/avformat.h"
#include "libavformat/avio.h"
#include "libavcodec/avcodec.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/frame.h"
#include "libavutil/opt.h"
#include "libswresample/swresample.h"
#ifdef __cplusplus
}
#endif
class FFAudioResample {
private:
int64_t pts = 0;
AVPacket input_packet;
AVPacket output_packet;
AVFrame *input_frame;
AVFrame *output_frame;
int openInputFile(const char *filename,
AVFormatContext **input_format_context,
AVCodecContext **input_codec_context);
int openOutputFile(const char *filename,
int sample_rate,
AVCodecContext *input_codec_context,
AVFormatContext **output_format_context,
AVCodecContext **output_codec_context);
int initResample(AVCodecContext *input_codec_context,
AVCodecContext *output_codec_context,
SwrContext **resample_context);
int decodeAudioFrame(AVFrame *frame,
AVFormatContext *input_format_context,
AVCodecContext *input_codec_context,
int *data_present, int *finished);
int initConvertedSamples(uint8_t ***converted_input_samples,
AVCodecContext *output_codec_context, int frame_size);
int decodeAndConvert(AVAudioFifo *fifo,
AVFormatContext *input_format_context,
AVCodecContext *input_codec_context,
AVCodecContext *output_codec_context,
SwrContext *resample_context,
int *finished);
int encodeAudioFrame(AVFrame *frame,
AVFormatContext *output_format_context,
AVCodecContext *output_codec_context,
int *data_present);
int encodeAndWrite(AVAudioFifo *fifo,
AVFormatContext *output_format_context,
AVCodecContext *output_codec_context);
public:
int resampling(const char *src_file, const char *dst_file, int sampleRate);
};
#endif //FFMPEGANDROID_FF_AUDIO_RESAMPLE_H

8
app/src/main/cpp/ffmpeg_jni_define.h
Unescape View File

@ -46,4 +46,12 @@ extern "C" { \
JNIEXPORT RETURN_TYPE JNICALL Java_com_frank_ffmpeg_metadata_FFmpegMediaRetriever_ ## FUNC_NAME \ JNIEXPORT RETURN_TYPE JNICALL Java_com_frank_ffmpeg_metadata_FFmpegMediaRetriever_ ## FUNC_NAME \
(JNIEnv *env, jobject thiz, ##__VA_ARGS__)\ (JNIEnv *env, jobject thiz, ##__VA_ARGS__)\
#define COMMON_MEDIA_FUNC(RETURN_TYPE, FUNC_NAME, ...) \
extern "C" { \
JNIEXPORT RETURN_TYPE JNICALL Java_com_frank_ffmpeg_CommonMediaHelper_ ## FUNC_NAME \
(JNIEnv *env, jobject thiz, ##__VA_ARGS__);\
}\
JNIEXPORT RETURN_TYPE JNICALL Java_com_frank_ffmpeg_CommonMediaHelper_ ## FUNC_NAME \
(JNIEnv *env, jobject thiz, ##__VA_ARGS__)\
#endif //FFMPEGANDROID_FFMPEG_JNI_DEFINE_H #endif //FFMPEGANDROID_FFMPEG_JNI_DEFINE_H

16
app/src/main/java/com/frank/ffmpeg/CommonMediaHelper.java
Unescape View File

@ -0,0 +1,16 @@
package com.frank.ffmpeg;
/**
* @author xufulong
* @date 2022/9/7 10:16 上午
* @desc
*/
public class CommonMediaHelper {
static {
System.loadLibrary("media-handle");
}
public native int audioResample(String inputFile, String outputFile, int sampleRate);
}

2
app/src/main/java/com/frank/ffmpeg/VideoPlayer.java
Unescape View File

@ -28,8 +28,6 @@ public class VideoPlayer {
public native int executeTranscode(String inputFile, String outputFile); public native int executeTranscode(String inputFile, String outputFile);
public native int audioResample(String inputFile, String outputFile, int sampleRate);
/** /**
* Create an AudioTrack instance for JNI calling * Create an AudioTrack instance for JNI calling
* *

Write Preview
Loading…
Cancel
Save