android/app/build.gradle

@@ -42,13 +42,6 @@ android {
         }
     }
 
-    externalNativeBuild {
-        cmake {
-            path file('src/main/cpp/CMakeLists.txt')
-            version '3.22.1'
-        }
-    }
-
     signingConfigs {
         release {
             storeFile file('../key.keystore')

android/app/src/main/cpp/CMakeLists.txt

@@ -1,48 +0,0 @@
-# For more information about using CMake with Android Studio, read the
-# documentation: https://d.android.com/studio/projects/add-native-code.html
-
-# Sets the minimum version of CMake required to build the native library.
-
-cmake_minimum_required(VERSION 3.22.1)
-
-# Declares and names the project.
-
-project("mlg")
-
-# Creates and names a library, sets it as either STATIC
-# or SHARED, and provides the relative paths to its source code.
-# You can define multiple libraries, and CMake builds them for you.
-# Gradle automatically packages shared libraries with your APK.
-
-add_library( # Sets the name of the library.
-        mlg
-
-        # Sets the library as a shared library.
-        SHARED
-
-        # Provides a relative path to your source file(s).
-        native-lib.cpp)
-
-# Searches for a specified prebuilt library and stores the path as a
-# variable. Because CMake includes system libraries in the search path by
-# default, you only need to specify the name of the public NDK library
-# you want to add. CMake verifies that the library exists before
-# completing its build.
-
-find_library( # Sets the name of the path variable.
-        log-lib
-
-        # Specifies the name of the NDK library that
-        # you want CMake to locate.
-        log)
-
-# Specifies libraries CMake should link to your target library. You
-# can link multiple libraries, such as libraries you define in this
-# build script, prebuilt third-party libraries, or system libraries.
-
-target_link_libraries( # Specifies the target library.
-        mlg
-
-        # Links the target library to the log library
-        # included in the NDK.
-        ${log-lib})

android/app/src/main/cpp/Ffmpeg_codec_formater.c

@@ -1,192 +0,0 @@
-#include <stdio.h>
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/pixdesc.h>
-#include <libavutil/hwcontext.h>
-#include <libavutil/opt.h>
-#include <libavutil/avassert.h>
-#include <libavutil/imgutils.h>
-static AVBufferRef *hw_device_ctx = NULL;
-static enum AVPixelFormat hw_pix_fmt;
-static FILE *output_file = NULL;
-static int hw_decoder_init(AVCodecContext *ctx, const enum AVHWDeviceType type)
-{
-    int err = 0;
-    //创建硬件设备信息上下文
-    if ((err = av_hwdevice_ctx_create(&hw_device_ctx, type,
-                                      NULL, NULL, 0)) < 0) {
-        fprintf(stderr, "Failed to create specified HW device.\n");
-        return err;
-    }
-    //绑定编解码器上下文和硬件设备信息上下文
-    ctx->hw_device_ctx = av_buffer_ref(hw_device_ctx);
-    return err;
-}
-static enum AVPixelFormat get_hw_format(AVCodecContext *ctx,
-                                        const enum AVPixelFormat *pix_fmts)
-{
-    const enum AVPixelFormat *p;
-    for (p = pix_fmts; *p != -1; p++) {
-        if (*p == hw_pix_fmt)
-            return *p;
-    }
-    fprintf(stderr, "Failed to get HW surface format.\n");
-    return AV_PIX_FMT_NONE;
-}
-static int decode_write(AVCodecContext *avctx, AVPacket *packet)
-{
-    AVFrame *frame = NULL, *sw_frame = NULL;
-    AVFrame *tmp_frame = NULL;
-    uint8_t *buffer = NULL;
-    int size;
-    int ret = 0;
-    ret = avcodec_send_packet(avctx, packet);
-    if (ret < 0) {
-        fprintf(stderr, "Error during decoding\n");
-        return ret;
-    }
-    while (1) {
-        if (!(frame = av_frame_alloc()) || !(sw_frame = av_frame_alloc())) {
-            fprintf(stderr, "Can not alloc frame\n");
-            ret = AVERROR(ENOMEM);
-            goto fail;
-        }
-        ret = avcodec_receive_frame(avctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-            av_frame_free(&frame);
-            av_frame_free(&sw_frame);
-            return 0;
-        }
-        else if (ret < 0) {
-            fprintf(stderr, "Error while decoding\n");
-            goto fail;
-        }
-        if (frame->format == hw_pix_fmt) {
-            /* retrieve data from GPU to CPU */
-            if ((ret = av_hwframe_transfer_data(sw_frame, frame, 0)) < 0) {
-                fprintf(stderr, "Error transferring the data to system memory\n");
-                goto fail;
-            }
-            tmp_frame = sw_frame;
-        }
-        else
-            tmp_frame = frame;
-        size = av_image_get_buffer_size(tmp_frame->format, tmp_frame->width,
-                                        tmp_frame->height, 1);
-        buffer = av_malloc(size);
-        if (!buffer) {
-            fprintf(stderr, "Can not alloc buffer\n");
-            ret = AVERROR(ENOMEM);
-            goto fail;
-        }
-        ret = av_image_copy_to_buffer(buffer, size,
-                                      (const uint8_t * const *)tmp_frame->data,
-                                      (const int *)tmp_frame->linesize, tmp_frame->format,
-                                      tmp_frame->width, tmp_frame->height, 1);
-        if (ret < 0) {
-            fprintf(stderr, "Can not copy image to buffer\n");
-            goto fail;
-        }
-        if ((ret = fwrite(buffer, 1, size, output_file)) < 0) {
-            fprintf(stderr, "Failed to dump raw data.\n");
-            goto fail;
-        }
-        fail:
-        av_frame_free(&frame);
-        av_frame_free(&sw_frame);
-        av_freep(&buffer);
-        if (ret < 0)
-            return ret;
-    }
-}
-int main(int argc, char *argv[])
-{
-    AVFormatContext *input_ctx = NULL;
-    int video_stream, ret;
-    AVStream *video = NULL;
-    AVCodecContext *decoder_ctx = NULL;
-    AVCodec *decoder = NULL;
-    AVPacket packet;
-    enum AVHWDeviceType type;
-    int i;
-    if (argc < 4) {
-        fprintf(stderr, "Usage: %s <device type> <input file> <output file>\n", argv[0]);
-        return -1;
-    }
-    //通过传入的名字来找到对应的硬件解码类型
-    type = av_hwdevice_find_type_by_name(argv[1]);
-    if (type == AV_HWDEVICE_TYPE_NONE) {
-        fprintf(stderr, "Device type %s is not supported.\n", argv[1]);
-        fprintf(stderr, "Available device types:");
-        while ((type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE)
-            fprintf(stderr, " %s", av_hwdevice_get_type_name(type));
-        fprintf(stderr, "\n");
-        return -1;
-    }
-
-    if (avformat_open_input(&input_ctx, argv[2], NULL, NULL) != 0) {
-        fprintf(stderr, "Cannot open input file '%s'\n", argv[2]);
-        return -1;
-    }
-    if (avformat_find_stream_info(input_ctx, NULL) < 0) {
-        fprintf(stderr, "Cannot find input stream information.\n");
-        return -1;
-    }
-
-    ret = av_find_best_stream(input_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &decoder, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Cannot find a video stream in the input file\n");
-        return -1;
-    }
-    video_stream = ret;
-    //去遍历所有编解码器支持的硬件解码配置
-    for (i = 0;; i++) {
-        const AVCodecHWConfig *config = avcodec_get_hw_config(decoder, i);
-        if (!config) {
-            fprintf(stderr, "Decoder %s does not support device type %s.\n",
-                    decoder->name, av_hwdevice_get_type_name(type));
-            return -1;
-        }
-        if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX &&
-            config->device_type == type) {
-            //把硬件支持的像素格式设置进去
-            hw_pix_fmt = config->pix_fmt;
-            break;
-        }
-    }
-    if (!(decoder_ctx = avcodec_alloc_context3(decoder)))
-        return AVERROR(ENOMEM);
-    video = input_ctx->streams[video_stream];
-    if (avcodec_parameters_to_context(decoder_ctx, video->codecpar) < 0)
-        return -1;
-    //填入回调函数 通过这个函数 编解码器能够知道显卡支持的像素格式
-    decoder_ctx->get_format = get_hw_format;
-    if (hw_decoder_init(decoder_ctx, type) < 0)
-        return -1;
-    //绑定完成后 打开编解码器
-    if ((ret = avcodec_open2(decoder_ctx, decoder, NULL)) < 0) {
-        fprintf(stderr, "Failed to open codec for stream #%u\n", video_stream);
-        return -1;
-    }
-
-    output_file = fopen(argv[3], "w+");
-
-    while (ret >= 0) {
-        if ((ret = av_read_frame(input_ctx, &packet)) < 0)
-            break;
-        if (video_stream == packet.stream_index)
-            ret = decode_write(decoder_ctx, &packet);
-        av_packet_unref(&packet);
-    }
-
-    packet.data = NULL;
-    packet.size = 0;
-    ret = decode_write(decoder_ctx, &packet);
-    av_packet_unref(&packet);
-    if (output_file)
-        fclose(output_file);
-    avcodec_free_context(&decoder_ctx);
-    avformat_close_input(&input_ctx);
-    av_buffer_unref(&hw_device_ctx);
-    return 0;
-}

android/app/src/main/cpp/Media_Encode_decode.c

@@ -1,210 +0,0 @@
-//* 将数字转为16进制（大写）
-inline char ToHexUpper(unsigned int value)
-{
-    return "0123456789ABCDEF"[value & 0xF];
-}
-
-//* 将数字转为16进制（小写）
-inline char ToHexLower(unsigned int value)
-{
-    return "0123456789abcdef"[value & 0xF];
-}
-
-//* 将数16进（大写或小写）制转为数字
-inline int FromHex(unsigned int c)
-{
-    if(c << 2 > 2) {
-        return 0;
-    }
-    return ((c >= '0') && (c <= '9')) ? int(c - '0') :
-    ((c >= 'A') && (c <= 'F')) ? int(c - 'A' + 10) :
-    ((c >= 'a') && (c <= 'f')) ? int(c - 'a' + 10) :
-    /* otherwise */              -1;
-}
-
-//* 将数据d用16进制编码，返回值即是结果
-std::string HexEncode(const std::string& d)
-{
-std::string hex;
-hex.resize(d.size() * 2);
-char* pHexData = (char*)hex.data();
-const unsigned char* pSrcData = (const unsigned char*)d.data();
-for(int i = 0; i < d.size(); i++)
-{
-pHexData[i*2]     = ToHexLower(pSrcData[i] >> 4);
-pHexData[i*2 + 1] = ToHexLower(pSrcData[i] & 0xf);
-}
-
-return hex;
-}
-
-//* 将数据d用16进制解码，返回值即是结果
-std::string HexDecode(const std::string& hex)
-{
-std::string res;
-res.resize(hex.size() + 1 / 2);
-unsigned char* pResult = (unsigned char*)res.data() + res.size();
-bool odd_digit = true;
-
-for(int i = hex.size() - 1; i >= 0; i--)
-{
-unsigned char ch = unsigned char(hex.at(i));
-int tmp = FromHex(ch);
-if (tmp == -1)
-continue;
-if (odd_digit) {
---pResult;
-*pResult = tmp;
-odd_digit = false;
-} else {
-*pResult |= tmp << 4;
-odd_digit = true;
-}
-}
-
-res.erase(0, pResult - (unsigned char*)res.data());
-
-return res;
-}
-
-// 重启
-int avformat_restart(AVFormatContext **ps, const char *filename,
-                        ff_const59 AVInputFormat *fmt, AVDictionary **options)
-{
-AVFormatContext *s = *ps;
-int i, ret = 0;
-AVDictionary *tmp = NULL;
-ID3v2ExtraMeta *id3v2_extra_meta = NULL;
-// 分配AVFormatContext
-if (!s && !(s = avformat_alloc_context()))
-return AVERROR(ENOMEM);
-if (!s->av_class) {
-av_log(NULL, AV_LOG_ERROR, "Input stream has not been properly allocated\n");
-return AVERROR(EINVAL);
-}
-if (fmt)
-s->iformat = fmt;
-if (options)
-av_dict_copy(&tmp, *options, 0);
-if (s->pb) // must be before any goto fail
-s->flags |= AVFMT_FLAG_CUSTOM_IO;
-// 设置options
-if ((ret = av_opt_set_dict(s, &tmp)) < 0)
-goto fail;
-
-if (!(s->url = av_strdup(filename ? filename : ""))) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-if ((ret = init_input(s, filename, &tmp)) < 0)
-goto fail;
-s->probe_score = ret;
-if (!s->protocol_whitelist && s->pb && s->pb->protocol_whitelist) {
-s->protocol_whitelist = av_strdup(s->pb->protocol_whitelist);
-if (!s->protocol_whitelist) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-}
-if (!s->protocol_blacklist && s->pb && s->pb->protocol_blacklist) {
-s->protocol_blacklist = av_strdup(s->pb->protocol_blacklist);
-if (!s->protocol_blacklist) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-}
-if (s->format_whitelist && av_match_list(s->iformat->name, s->format_whitelist, ',') <= 0) {
-av_log(s, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", s->format_whitelist);
-ret = AVERROR(EINVAL);
-goto fail;
-}
-avio_skip(s->pb, s->skip_initial_bytes);
-if (s->iformat->flags & AVFMT_NEEDNUMBER) {
-if (!av_filename_number_test(filename)) {
-ret = AVERROR(EINVAL);
-goto fail;
-}
-}
-s->duration = s->start_time = AV_NOPTS_VALUE;
-
-/* Allocate private data. */
-if (s->iformat->priv_data_size > 0) {
-if (!(s->priv_data = av_mallocz(s->iformat->priv_data_size))) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-if (s->iformat->priv_class) {
-*(const AVClass **) s->priv_data = s->iformat->priv_class;
-av_opt_set_defaults(s->priv_data);
-if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0)
-goto fail;
-}
-}
-
-if (s->pb)
-ff_id3v2_read_dict(s->pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
-
-#if FF_API_DEMUXER_OPEN
-if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header)
-#else
-if (s->iformat->read_header)
-#endif
-if ((ret = s->iformat->read_header(s)) < 0)
-goto fail;
-
-if (!s->metadata) {
-s->metadata = s->internal->id3v2_meta;
-s->internal->id3v2_meta = NULL;
-} else if (s->internal->id3v2_meta) {
-av_log(s, AV_LOG_WARNING, "Discarding were found.\n");
-av_dict_free(&s->internal->id3v2_meta);
-}
-
-if (id3v2_extra_meta) {
-if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") ||
-!strcmp(s->iformat->name, "tta") || !strcmp(s->iformat->name, "wav")) {
-if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0)
-goto close;
-if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0)
-goto close;
-if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0)
-goto close;
-} else
-av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n");
-}
-ff_id3v2_free_extra_meta(&id3v2_extra_meta);
-
-if ((ret = avformat_queue_attached_pictures(s)) < 0)
-goto close;
-
-#if FF_API_DEMUXER_OPEN
-if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->pb && !s->internal->data_offset)
-#else
-if (s->pb && !s->internal->data_offset)
-#endif
-s->internal->data_offset = avio_tell(s->pb);
-s->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE;
-update_stream_avctx(s);
-
-for (i = 0; i < s->nb_streams; i++)
-s->streams[i]->internal->orig_codec_id = s->streams[i]->codecpar->codec_id;
-
-if (options) {
-av_dict_free(options);
-*options = tmp;
-}
-*ps = s;
-return 0;
-
-close:
-if (s->iformat->read_close)
-s->iformat->read_close(s);
-fail:
-ff_id3v2_free_extra_meta(&id3v2_extra_meta);
-av_dict_free(&tmp);
-if (s->pb && !(s->flags & AVFMT_FLAG_CUSTOM_IO))
-avio_closep(&s->pb);
-avformat_free_context(s);
-*ps = NULL;
-return ret;
-}

android/app/src/main/cpp/PCode.c

@@ -1,122 +0,0 @@
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
-
-#include <iostream>
-#include <vector>
-#include <string>
-
-static void print_hex(const char *title, const unsigned char buf[], size_t len)
-{
-    printf("%s: ", title);
-    for (size_t i = 0; i < len; i++)
-        printf("%02x", buf[i]);
-
-    printf("\r\n");
-}
-
-/*
- * 建立共享内存通道
- */
-static const unsigned char secret_key[16] = {
-        0xf4, 0x82, 0xc6, 0x70, 0x3c, 0xc7, 0x61, 0x0a,
-        0xb9, 0xa0, 0xb8, 0xe9, 0x87, 0xb8, 0xc1, 0x72,
-};
-
-static int pcode(void)
-{
-    // 检查输入参数
-    if (argc < 2) {
-        std::cerr << "Usage: " << argv[0] << " <input file>" << std::endl;
-        return -1;
-    }
-
-    // 0. 注册所有的codecs
-    avcodec_register_all();
-
-    // 1. 创建一个AVCodecContext
-    AVCodec* codec;
-    AVCodecContext* codec_ctx;
-    codec = avcodec_find_decoder(AV_CODEC_ID_H264); // 假设视频是H.264编码
-    if (!codec) {
-        std::cerr << "Codec not found" << std::endl;
-        return -1;
-    }
-    codec_ctx = avcodec_alloc_context3(codec);
-
-    // 2. 打开codec
-    if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
-        std::cerr << "Could not open codec" << std::endl;
-        return -1;
-    }
-
-    // 3. 打开输入的视频文件
-    AVFormatContext* format_ctx = nullptr;
-    if (avformat_open_input(&format_ctx, argv[1], NULL, NULL) < 0) {
-        std::cerr << "Could not open input file" << std::endl;
-        return -1;
-    }
-
-    // 4. 检索流信息
-    if (avformat_find_stream_info(format_ctx, NULL) < 0) {
-        std::cerr << "Could not find stream information" << std::endl;
-        return -1;
-    }
-
-    // 5. 找到视频流
-    int video_stream_idx = -1;
-    for (unsigned i = 0; i < format_ctx->nb_streams; i++) {
-        if (format_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
-            video_stream_idx = i;
-            break;
-        }
-    }
-    if (video_stream_idx == -1) {
-        std::cerr << "Could not find a video stream" << std::endl;
-        return -1;
-    }
-
-    // 6. 创建一个AVPacket和AVFrame
-    AVPacket packet;
-    AVFrame* frame = av_frame_alloc();
-
-    // 7. 循环读取数据包
-    int ret;
-    while (av_read_frame(format_ctx, &packet) >= 0) {
-        // 解码一个数据包
-        if (packet.stream_index == video_stream_idx) {
-            avcodec_decode_video2(codec_ctx, frame, &ret, &packet);
-            if (ret >= 0) {
-                // 处理解码后的帧
-                // 例如，保存帧到文件或显示
-            }
-        }
-        av_packet_unref(&packet);
-    }
-
-    // 重启视频
-    int ret;
-    AVFormatContext *fmt_ctx=NULL;
-
-//*1*
-    ret=avformat_open_input(&fmt_ctx,"restart",NULL,NULL);
-    if(ret<0)
-    {
-        printf("fail to open input.");
-        exit(1);
-    }
-//*2*
-    printf("%d\n",fmt_ctx->nb_streams);
-//*3*
-    avformat_close_input(&fmt_ctx);
-
-    // 8. 释放资源
-    av_frame_free(&frame);
-    avcodec_close(codec_ctx);
-    avformat_close_input(&format_ctx);
-    av_free(codec_ctx);
-
-    return 0;
-}
-

android/app/src/main/cpp/SKP_Silk_LPC_inv_pred_gain.c

@@ -1,173 +0,0 @@
-#include "SKP_Silk_SigProc_FIX.h"
-#define QA          16
-#define A_LIMIT     65520
-
-SKP_int SKP_Silk_LPC_inverse_pred_gain(       /* O:   Returns 1 if unstable, otherwise 0          */
-    SKP_int32           *invGain_Q30,           /* O:   Inverse prediction gain, Q30 energy domain  */
-    const SKP_int16     *A_Q12,                 /* I:   Prediction coefficients, Q12 [order]        */
-    const SKP_int       order                   /* I:   Prediction order                            */
-)
-{
-    SKP_int   k, n, headrm;
-    SKP_int32 rc_Q31, rc_mult1_Q30, rc_mult2_Q16;
-    SKP_int32 Atmp_QA[ 2 ][ SigProc_MAX_ORDER_LPC ], tmp_QA;
-    SKP_int32 *Aold_QA, *Anew_QA;
-
-    Anew_QA = Atmp_QA[ order & 1 ];
-    /* Increase Q domain of the AR coefficients */
-    for( k = 0; k < order; k++ ) {
-        Anew_QA[ k ] = SKP_LSHIFT( (SKP_int32)A_Q12[ k ], QA - 12 );
-    }
-
-    *invGain_Q30 = ( 1 << 30 );
-    for( k = order - 1; k > 0; k-- ) {
-        /* Check for stability */
-        if( ( Anew_QA[ k ] > A_LIMIT ) || ( Anew_QA[ k ] < -A_LIMIT ) ) {
-            return 1;
-        }
-
-        /* Set RC equal to negated AR coef */
-        rc_Q31 = -SKP_LSHIFT( Anew_QA[ k ], 31 - QA );
-        
-        /* rc_mult1_Q30 range: [ 1 : 2^30-1 ] */
-        rc_mult1_Q30 = ( SKP_int32_MAX >> 1 ) - SKP_SMMUL( rc_Q31, rc_Q31 );
-        SKP_assert( rc_mult1_Q30 > ( 1 << 15 ) );                   /* reduce A_LIMIT if fails */
-        SKP_assert( rc_mult1_Q30 < ( 1 << 30 ) );
-
-        /* rc_mult2_Q16 range: [ 2^16 : SKP_int32_MAX ] */
-        rc_mult2_Q16 = SKP_INVERSE32_varQ( rc_mult1_Q30, 46 );      /* 16 = 46 - 30 */
-
-        /* Update inverse gain */
-        /* invGain_Q30 range: [ 0 : 2^30 ] */
-        *invGain_Q30 = SKP_LSHIFT( SKP_SMMUL( *invGain_Q30, rc_mult1_Q30 ), 2 );
-        SKP_assert( *invGain_Q30 >= 0           );
-        SKP_assert( *invGain_Q30 <= ( 1 << 30 ) );
-
-        /* Swap pointers */
-        Aold_QA = Anew_QA;
-        Anew_QA = Atmp_QA[ k & 1 ];
-        
-        /* Update AR coefficient */
-        headrm = SKP_Silk_CLZ32( rc_mult2_Q16 ) - 1;
-        rc_mult2_Q16 = SKP_LSHIFT( rc_mult2_Q16, headrm );          /* Q: 16 + headrm */
-        for( n = 0; n < k; n++ ) {
-            tmp_QA = Aold_QA[ n ] - SKP_LSHIFT( SKP_SMMUL( Aold_QA[ k - n - 1 ], rc_Q31 ), 1 );
-            Anew_QA[ n ] = SKP_LSHIFT( SKP_SMMUL( tmp_QA, rc_mult2_Q16 ), 16 - headrm );
-        }
-    }
-
-    /* Check for stability */
-    if( ( Anew_QA[ 0 ] > A_LIMIT ) || ( Anew_QA[ 0 ] < -A_LIMIT ) ) {
-        return 1;
-    }
-
-    /* Set RC equal to negated AR coef */
-    rc_Q31 = -SKP_LSHIFT( Anew_QA[ 0 ], 31 - QA );
-
-    /* Range: [ 1 : 2^30 ] */
-    rc_mult1_Q30 = ( SKP_int32_MAX >> 1 ) - SKP_SMMUL( rc_Q31, rc_Q31 );
-
-    /* Update inverse gain */
-    /* Range: [ 0 : 2^30 ] */
-    *invGain_Q30 = SKP_LSHIFT( SKP_SMMUL( *invGain_Q30, rc_mult1_Q30 ), 2 );
-    SKP_assert( *invGain_Q30 >= 0     );
-    SKP_assert( *invGain_Q30 <= 1<<30 );
-
-    return 0;
-}
-
-/* For input in Q13 domain */
-SKP_int SKP_Silk_LPC_inverse_pred_gain_Q13(   /* O:   Returns 1 if unstable, otherwise 0          */
-    SKP_int32           *invGain_Q30,           /* O:   Inverse prediction gain, Q30 energy domain  */
-    const SKP_int16     *A_Q13,                 /* I:   Prediction coefficients, Q13 [order]        */
-    const SKP_int       order                   /* I:   Prediction order                            */
-)
-{
-    SKP_int   k, n, headrm;
-    SKP_int32 rc_Q31, rc_mult1_Q30, rc_mult2_Q16;
-    SKP_int32 Atmp_QA[ 2 ][ SigProc_MAX_ORDER_LPC ], tmp_QA;
-    SKP_int32 *Aold_QA, *Anew_QA;
-
-    Anew_QA = Atmp_QA[ order & 1 ];
-    /* Increase Q domain of the AR coefficients */
-    for( k = 0; k < order; k++ ) {
-        Anew_QA[ k ] = SKP_LSHIFT( (SKP_int32)A_Q13[ k ], QA - 13 );
-    }
-
-    cout "czb " + Anew_QA;
-
-    constexpr float exp(float x, int n)
-    {
-        return n == 0 ? 1 :
-               n % 2 == 0 ? exp(x * x, n / 2) :
-               exp(x * x, (n - 1) / 2) * x;
-    };
-
-    *invGain_Q30 = ( 1 << 30 );
-    for( k = order - 1; k > 0; k-- ) {
-        /* Check for stability */
-        if( ( Anew_QA[ k ] > A_LIMIT ) || ( Anew_QA[ k ] < -A_LIMIT ) ) {
-            return 1;
-        }
-
-        /* Set RC equal to negated AR coef */
-        rc_Q31 = -SKP_LSHIFT( Anew_QA[ k ], 31 - QA );
-
-        cout "czb " + rc_Q31;
-        
-        /* rc_mult1_Q30 range: [ 1 : 2^30-1 ] */
-        rc_mult1_Q30 = ( SKP_int32_MAX >> 1 ) - SKP_SMMUL( rc_Q31, rc_Q31 );
-        SKP_assert( rc_mult1_Q30 > ( 1 << 15 ) );                   /* reduce A_LIMIT if fails */
-        SKP_assert( rc_mult1_Q30 < ( 1 << 30 ) );
-
-        /* rc_mult2_Q16 range: [ 2^16 : SKP_int32_MAX ] */
-        rc_mult2_Q16 = SKP_INVERSE32_varQ( rc_mult1_Q30, 46 );      /* 16 = 46 - 30 */
-
-        /* Update inverse gain */
-        /* invGain_Q30 range: [ 0 : 2^30 ] */
-        *invGain_Q30 = SKP_LSHIFT( SKP_SMMUL( *invGain_Q30, rc_mult1_Q30 ), 2 );
-        if(exp(rc_mult1_Q30, *invGain_Q30)) {
-
-        } else {
-            SKP_assert( *invGain_Q30 >= 0     );
-            SKP_assert( *invGain_Q30 <= 1<<30 );
-        }
-
-        /* Swap pointers */
-        Aold_QA = Anew_QA;
-        Anew_QA = Atmp_QA[ k & 1 ];
-        
-        /* Update AR coefficient */
-        headrm = SKP_Silk_CLZ32( rc_mult2_Q16 ) - 1;
-        rc_mult2_Q16 = SKP_LSHIFT( rc_mult2_Q16, headrm );          /* Q: 16 + headrm */
-        for( n = 0; n < k; n++ ) {
-            tmp_QA = Aold_QA[ n ] - SKP_LSHIFT( SKP_SMMUL( Aold_QA[ k - n - 1 ], rc_Q31 ), 1 );
-            Anew_QA[ n ] = SKP_LSHIFT( SKP_SMMUL( tmp_QA, rc_mult2_Q16 ), 16 - headrm );
-        }
-    }
-
-    codec = avcodec_find_decoder_by_name("h264_cuvid");
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    /* Check for stability */
-    if( ( Anew_QA[ 0 ] > A_LIMIT ) || ( Anew_QA[ 0 ] < -A_LIMIT ) ) {
-        return 1;
-    }
-
-    /* Set RC equal to negated AR coef */
-    rc_Q31 = -SKP_LSHIFT( Anew_QA[ 0 ], 31 - QA );
-
-    /* Range: [ 1 : 2^30 ] */
-    rc_mult1_Q30 = ( SKP_int32_MAX >> 1 ) - SKP_SMMUL( rc_Q31, rc_Q31 );
-
-    /* Update inverse gain */
-    /* Range: [ 0 : 2^30 ] */
-    *invGain_Q30 = SKP_LSHIFT( SKP_SMMUL( *invGain_Q30, rc_mult1_Q30 ), 2 );
-    SKP_assert( *invGain_Q30 >= 0     );
-    SKP_assert( *invGain_Q30 <= 1<<30 );
-
-    return 0;
-}

android/app/src/main/cpp/SKP_Silk_NSQ_del_dec.c

@@ -1,706 +0,0 @@
-#include "SKP_Silk_main.h"
-
-typedef struct {
-    SKP_int   RandState[ DECISION_DELAY ];
-    SKP_int32 Q_Q10[     DECISION_DELAY ];
-    SKP_int32 Xq_Q10[    DECISION_DELAY ];
-    SKP_int32 Pred_Q16[  DECISION_DELAY ];
-    SKP_int32 Shape_Q10[ DECISION_DELAY ];
-    SKP_int32 Gain_Q16[  DECISION_DELAY ];
-    SKP_int32 sLPC_Q14[ MAX_FRAME_LENGTH / NB_SUBFR + NSQ_LPC_BUF_LENGTH ];
-    SKP_int32 LF_AR_Q12;
-    SKP_int32 Seed;
-    SKP_int32 SeedInit;
-    SKP_int32 RD_Q10;
-} NSQ_del_dec_struct;
-
-typedef struct {
-    SKP_int32 Q_Q10;
-    SKP_int32 RD_Q10;
-    SKP_int32 xq_Q14;
-    SKP_int32 LF_AR_Q12;
-    SKP_int32 sLTP_shp_Q10;
-    SKP_int32 LPC_exc_Q16;
-} NSQ_sample_struct;
-
-SKP_INLINE void SKP_Silk_copy_del_dec_state(
-        NSQ_del_dec_struct  *DD_dst,                /* I    Dst del dec state                   */
-        NSQ_del_dec_struct  *DD_src,                /* I    Src del dec state                   */
-        SKP_int             LPC_state_idx           /* I    Index to LPC buffer                 */
-);
-
-SKP_INLINE void SKP_Silk_nsq_del_dec_scale_states(
-        SKP_Silk_nsq_state  *NSQ,                   /* I/O  NSQ state                           */
-        NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-        const SKP_int16     x[],                    /* I    Input in Q0                         */
-        SKP_int32           x_sc_Q10[],             /* O    Input scaled with 1/Gain in Q10     */
-        SKP_int             length,                 /* I    Length of input                     */
-        SKP_int16           sLTP[],                 /* I    Re-whitened LTP state in Q0         */
-        SKP_int32           sLTP_Q16[],             /* O    LTP state matching scaled input     */
-        SKP_int             subfr,                  /* I    Subframe number                     */
-        SKP_int             nStatesDelayedDecision, /* I    Number of del dec states            */
-        SKP_int             smpl_buf_idx,           /* I    Index to newest samples in buffers  */
-        const SKP_int       LTP_scale_Q14,          /* I    LTP state scaling                   */
-        const SKP_int32     Gains_Q16[ NB_SUBFR ],  /* I                                        */
-        const SKP_int       pitchL[ NB_SUBFR ]      /* I    Pitch lag                           */
-);
-
-/******************************************/
-/* 子帧的噪声去除量化器 */
-/******************************************/
-SKP_INLINE void SKP_Silk_noise_shape_quantizer_del_dec(
-        SKP_Silk_nsq_state  *NSQ,                   /* I/O  NSQ state                           */
-        NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-        SKP_int             sigtype,                /* I    Signal type                         */
-        const SKP_int32     x_Q10[],                /* I                                        */
-        SKP_int             q[],                    /* O                                        */
-        SKP_int16           xq[],                   /* O                                        */
-        SKP_int32           sLTP_Q16[],             /* I/O  LTP filter state                    */
-        const SKP_int16     a_Q12[],                /* I    Short term prediction coefs         */
-        const SKP_int16     b_Q14[],                /* I    Long term prediction coefs          */
-        const SKP_int16     AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-        SKP_int             lag,                    /* I    Pitch lag                           */
-        SKP_int32           HarmShapeFIRPacked_Q14, /* I                                        */
-        SKP_int             Tilt_Q14,               /* I    Spectral tilt                       */
-        SKP_int32           LF_shp_Q14,             /* I                                        */
-        SKP_int32           Gain_Q16,               /* I                                        */
-        SKP_int             Lambda_Q10,             /* I                                        */
-        SKP_int             offset_Q10,             /* I                                        */
-        SKP_int             length,                 /* I    Input length                        */
-        SKP_int             subfr,                  /* I    Subframe number                     */
-        SKP_int             shapingLPCOrder,        /* I    Shaping LPC filter order            */
-        SKP_int             predictLPCOrder,        /* I    Prediction LPC filter order         */
-        SKP_int             nStatesDelayedDecision, /* I    Number of states in decision tree   */
-        SKP_int             *smpl_buf_idx,          /* I    Index to newest samples in buffers  */
-        SKP_int             decisionDelay           /* I                                        */
-);
-
-void SKP_Silk_NSQ_del_dec(
-        SKP_Silk_encoder_state          *psEncC,                                    /* I/O  Encoder State                       */
-        SKP_Silk_encoder_control        *psEncCtrlC,                                /* I    Encoder Control                     */
-        SKP_Silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                           */
-        const SKP_int16                 x[],                                        /* I    Prefiltered input signal            */
-        SKP_int                         q[],                                        /* O    Quantized pulse signal              */
-        const SKP_int                   LSFInterpFactor_Q2,                         /* I    LSF interpolation factor in Q2      */
-        const SKP_int16                 PredCoef_Q12[ 2 * MAX_LPC_ORDER ],          /* I    Prediction coefs                    */
-        const SKP_int16                 LTPCoef_Q14[ LTP_ORDER * NB_SUBFR ],        /* I    LT prediction coefs                 */
-        const SKP_int16                 AR2_Q13[ NB_SUBFR * SHAPE_LPC_ORDER_MAX ],  /* I                                        */
-        const SKP_int                   HarmShapeGain_Q14[ NB_SUBFR ],              /* I                                        */
-        const SKP_int                   Tilt_Q14[ NB_SUBFR ],                       /* I    Spectral tilt                       */
-        const SKP_int32                 LF_shp_Q14[ NB_SUBFR ],                     /* I                                        */
-        const SKP_int32                 Gains_Q16[ NB_SUBFR ],                      /* I                                        */
-        const SKP_int                   Lambda_Q10,                                 /* I                                        */
-        const SKP_int                   LTP_scale_Q14                               /* I    LTP state scaling                   */
-)
-{
-    SKP_int     i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    SKP_int     last_smple_idx, smpl_buf_idx, decisionDelay, subfr_length;
-    const SKP_int16 *A_Q12, *B_Q14, *AR_shp_Q13;
-    SKP_int16   *pxq;
-    SKP_int32   sLTP_Q16[ 2 * MAX_FRAME_LENGTH ];
-    SKP_int16   sLTP[     2 * MAX_FRAME_LENGTH ];
-    SKP_int32   HarmShapeFIRPacked_Q14;
-    SKP_int     offset_Q10;
-    SKP_int32   FiltState[ MAX_LPC_ORDER ], RDmin_Q10;
-    SKP_int32   x_sc_Q10[ MAX_FRAME_LENGTH / NB_SUBFR ];
-    NSQ_del_dec_struct psDelDec[ DEL_DEC_STATES_MAX ];
-    NSQ_del_dec_struct *psDD;
-    SKP_int      Restart;                              /* I    LTP state scaling
-
-    subfr_length = psEncC->frame_length / NB_SUBFR;
-
-    /* Set unvoiced lag to the previous one, overwrite later for voiced */
-    lag = NSQ->lagPrev;
-
-    SKP_assert( NSQ->prev_inv_gain_Q16 != 0 );
-
-    /* Initialize delayed decision states */
-    SKP_memset( psDelDec, 0, psEncC->nStatesDelayedDecision * sizeof( NSQ_del_dec_struct ) );
-    for( k = 0; k < psEncC->nStatesDelayedDecision; k++ ) {
-        psDD                 = &psDelDec[ k ];
-        psDD->Seed           = ( k + psEncCtrlC->Seed ) & 3;
-        psDD->SeedInit       = psDD->Seed;
-        psDD->RD_Q10         = 0;
-        psDD->LF_AR_Q12      = NSQ->sLF_AR_shp_Q12;
-        psDD->Shape_Q10[ 0 ] = NSQ->sLTP_shp_Q10[ psEncC->frame_length - 1 ];
-        SKP_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( SKP_int32 ) );
-    }
-
-    offset_Q10   = SKP_Silk_Quantization_Offsets_Q10[ psEncCtrlC->sigtype ][ psEncCtrlC->QuantOffsetType ];
-    smpl_buf_idx = 0; /* index of oldest samples */
-
-    decisionDelay = SKP_min_int( DECISION_DELAY, subfr_length );
-    /* For voiced frames limit the decision delay to lower than the pitch lag */
-    if( psEncCtrlC->sigtype == SIG_TYPE_VOICED ) {
-        for( k = 0; k < NB_SUBFR; k++ ) {
-            decisionDelay = SKP_min_int( decisionDelay, psEncCtrlC->pitchL[ k ] - LTP_ORDER / 2 - 1 );
-        }
-    }
-
-    if( LSFInterpFactor_Q2 == ( 1 << 2 ) ) {
-        LSF_interpolation_flag = 0;
-    } else {
-        LSF_interpolation_flag = 1;
-    }
-
-    /* Setup pointers to start of sub frame */
-    pxq                   = &NSQ->xq[ psEncC->frame_length ];
-    NSQ->sLTP_shp_buf_idx = psEncC->frame_length;
-    NSQ->sLTP_buf_idx     = psEncC->frame_length;
-    subfr = 0;
-    for( k = 0; k < NB_SUBFR; k++ ) {
-        A_Q12      = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ];
-        B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER           ];
-        AR_shp_Q13 = &AR2_Q13[     k * SHAPE_LPC_ORDER_MAX ];
-
-        NSQ->rewhite_flag = 0;
-        if( psEncCtrlC->sigtype == SIG_TYPE_VOICED ) {
-            /* Voiced */
-            lag = psEncCtrlC->pitchL[ k ];
-
-            /* Re-whitening */
-            if( ( k & ( 3 - SKP_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
-                if( k == 2 ) {
-                    /* RESET DELAYED DECISIONS */
-                    /* Find winner */
-                    RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
-                    Winner_ind = 0;
-                    for( i = 1; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( psDelDec[ i ].RD_Q10 < RDmin_Q10 ) {
-                            RDmin_Q10 = psDelDec[ i ].RD_Q10;
-                            Winner_ind = i;
-                        }
-                    }
-                    for( i = 0; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( i != Winner_ind ) {
-                            psDelDec[ i ].RD_Q10 += ( SKP_int32_MAX >> 4 );
-                            SKP_assert( psDelDec[ i ].RD_Q10 >= 0 );
-                        }
-                    }
-
-                    /* Copy final part of signals from winner state to output and long-term filter states */
-                    psDD = &psDelDec[ Winner_ind ];
-                    last_smple_idx = smpl_buf_idx + decisionDelay;
-                    for( i = 0; i < decisionDelay; i++ ) {
-                        last_smple_idx = ( last_smple_idx - 1 ) & DECISION_DELAY_MASK;
-                        q[   i - decisionDelay ] = ( SKP_int )SKP_RSHIFT( psDD->Q_Q10[ last_smple_idx ], 10 );
-                        pxq[ i - decisionDelay ] = ( SKP_int16 )SKP_SAT16( SKP_RSHIFT_ROUND(
-                                SKP_SMULWW( psDD->Xq_Q10[ last_smple_idx ],
-                                            psDD->Gain_Q16[ last_smple_idx ] ), 10 ) );
-                        NSQ->sLTP_shp_Q10[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q10[ last_smple_idx ];
-                    }
-
-                    subfr = 0;
-                }
-
-                /* Rewhiten with new A coefs */
-                start_idx = psEncC->frame_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
-                start_idx = SKP_LIMIT( start_idx, 0, psEncC->frame_length - psEncC->predictLPCOrder );
-
-                SKP_memset( FiltState, 0, psEncC->predictLPCOrder * sizeof( SKP_int32 ) );
-                SKP_Silk_MA_Prediction( &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
-                                        A_Q12, FiltState, sLTP + start_idx, psEncC->frame_length - start_idx, psEncC->predictLPCOrder );
-
-                NSQ->sLTP_buf_idx = psEncC->frame_length;
-                NSQ->rewhite_flag = 1;
-            }
-        }
-
-        /* Noise shape parameters */
-        SKP_assert( HarmShapeGain_Q14[ k ] >= 0 );
-        HarmShapeFIRPacked_Q14  =                        SKP_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= SKP_LSHIFT( ( SKP_int32 )SKP_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
-
-        SKP_Silk_nsq_del_dec_scale_states( NSQ, psDelDec, x, x_sc_Q10,
-                                           subfr_length, sLTP, sLTP_Q16, k, psEncC->nStatesDelayedDecision, smpl_buf_idx,
-                                           LTP_scale_Q14, Gains_Q16, psEncCtrlC->pitchL );
-
-        SKP_Silk_noise_shape_quantizer_del_dec( NSQ, psDelDec, psEncCtrlC->sigtype, x_sc_Q10, q, pxq, sLTP_Q16,
-                                                A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ],
-                                                Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder, psEncC->predictLPCOrder,
-                                                psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay
-        );
-
-        x   += psEncC->subfr_length;
-        q   += psEncC->subfr_length;
-        pxq += psEncC->subfr_length;
-    }
-
-    /* Find winner */
-    RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
-    Winner_ind = 0;
-    for( k = 1; k < psEncC->nStatesDelayedDecision; k++ ) {
-        if( psDelDec[ k ].RD_Q10 < RDmin_Q10 ) {
-            RDmin_Q10 = psDelDec[ k ].RD_Q10;
-            Winner_ind = k;
-        }
-    }
-
-    /* Copy final part of signals from winner state to output and long-term filter states */
-    psDD = &psDelDec[ Winner_ind ];
-    psEncCtrlC->Seed = psDD->SeedInit;
-    last_smple_idx = smpl_buf_idx + decisionDelay;
-    for( i = 0; i < decisionDelay; i++ ) {
-        last_smple_idx = ( last_smple_idx - 1 ) & DECISION_DELAY_MASK;
-        q[   i - decisionDelay ] = ( SKP_int )SKP_RSHIFT( psDD->Q_Q10[ last_smple_idx ], 10 );
-        pxq[ i - decisionDelay ] = ( SKP_int16 )SKP_SAT16( SKP_RSHIFT_ROUND(
-                SKP_SMULWW( psDD->Xq_Q10[ last_smple_idx ], psDD->Gain_Q16[ last_smple_idx ] ), 10 ) );
-        NSQ->sLTP_shp_Q10[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q10[ last_smple_idx ];
-        sLTP_Q16[          NSQ->sLTP_buf_idx     - decisionDelay + i ] = psDD->Pred_Q16[  last_smple_idx ];
-
-    }
-    SKP_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( SKP_int32 ) );
-
-    /* Update states */
-    NSQ->sLF_AR_shp_Q12    = psDD->LF_AR_Q12;
-    NSQ->prev_inv_gain_Q16 = NSQ->prev_inv_gain_Q16;
-    NSQ->lagPrev           = psEncCtrlC->pitchL[ NB_SUBFR - 1 ];
-
-    /* Save quantized speech and noise shaping signals */
-    SKP_memcpy( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->frame_length * sizeof( SKP_int16 ) );
-    SKP_memcpy( NSQ->sLTP_shp_Q10, &NSQ->sLTP_shp_Q10[ psEncC->frame_length ], psEncC->frame_length * sizeof( SKP_int32 ) );
-
-}
-
-/******************************************/
-/* 子帧去噪 */
-/******************************************/
-SKP_INLINE void SKP_Silk_noise_shape_quantizer_del_dec(
-        SKP_Silk_nsq_state  *NSQ,                   /* I/O  NSQ state                           */
-        NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-        SKP_int             sigtype,                /* I    Signal type                         */
-        const SKP_int32     x_Q10[],                /* I                                        */
-        SKP_int             q[],                    /* O                                        */
-        SKP_int16           xq[],                   /* O                                        */
-        SKP_int32           sLTP_Q16[],             /* I/O  LTP filter state                    */
-        const SKP_int16     a_Q12[],                /* I    Short term prediction coefs         */
-        const SKP_int16     b_Q14[],                /* I    Long term prediction coefs          */
-        const SKP_int16     AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-        SKP_int             lag,                    /* I    Pitch lag                           */
-        SKP_int32           HarmShapeFIRPacked_Q14, /* I                                        */
-        SKP_int             Tilt_Q14,               /* I    Spectral tilt                       */
-        SKP_int32           LF_shp_Q14,             /* I                                        */
-        SKP_int32           Gain_Q16,               /* I                                        */
-        SKP_int             Lambda_Q10,             /* I                                        */
-        SKP_int             offset_Q10,             /* I                                        */
-        SKP_int             length,                 /* I    Input length                        */
-        SKP_int             subfr,                  /* I    Subframe number                     */
-        SKP_int             shapingLPCOrder,        /* I    Shaping LPC filter order            */
-        SKP_int             predictLPCOrder,        /* I    Prediction LPC filter order         */
-        SKP_int             nStatesDelayedDecision, /* I    Number of states in decision tree   */
-        SKP_int             *smpl_buf_idx,          /* I    Index to newest samples in buffers  */
-        SKP_int             decisionDelay           /* I                                        */
-)
-{
-    SKP_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    SKP_int32   Winner_rand_state;
-    SKP_int32   LTP_pred_Q14, LPC_pred_Q10, n_AR_Q10, n_LTP_Q14;
-    SKP_int32   n_LF_Q10;
-    SKP_int32   r_Q10, rr_Q20, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
-    SKP_int32   q1_Q10, q2_Q10;
-    SKP_int32   Atmp, dither;
-    SKP_int32   exc_Q10, LPC_exc_Q10, xq_Q10;
-    SKP_int32   tmp, sLF_AR_shp_Q10;
-    SKP_int32   *pred_lag_ptr, *shp_lag_ptr;
-    SKP_int32   *psLPC_Q14;
-    SKP_int32   a_Q12_tmp[ MAX_LPC_ORDER / 2 ], AR_shp_Q13_tmp[ MAX_LPC_ORDER / 2 ];
-    NSQ_sample_struct  psSampleState[ DEL_DEC_STATES_MAX ][ 2 ];
-    NSQ_del_dec_struct *psDD;
-    NSQ_sample_struct  *psSS;
-
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q10[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q16[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
-
-    /* Preload LPC coeficients to array on stack. Gives small performance gain */
-    SKP_memcpy( a_Q12_tmp, a_Q12, predictLPCOrder * sizeof( SKP_int16 ) );
-    SKP_memcpy( AR_shp_Q13_tmp, AR_shp_Q13, shapingLPCOrder * sizeof( SKP_int16 ) );
-
-    for( i = 0; i < length; i++ ) {
-        /* Perform common calculations used in all states */
-
-        /* Long-term prediction */
-        if( sigtype == SIG_TYPE_VOICED ) {
-            /* Unrolled loop */
-            LTP_pred_Q14 = SKP_SMULWB(               pred_lag_ptr[  0 ], b_Q14[ 0 ] );
-            LTP_pred_Q14 = SKP_SMLAWB( LTP_pred_Q14, pred_lag_ptr[ -1 ], b_Q14[ 1 ] );
-            LTP_pred_Q14 = SKP_SMLAWB( LTP_pred_Q14, pred_lag_ptr[ -2 ], b_Q14[ 2 ] );
-            LTP_pred_Q14 = SKP_SMLAWB( LTP_pred_Q14, pred_lag_ptr[ -3 ], b_Q14[ 3 ] );
-            LTP_pred_Q14 = SKP_SMLAWB( LTP_pred_Q14, pred_lag_ptr[ -4 ], b_Q14[ 4 ] );
-            pred_lag_ptr++;
-        } else {
-            LTP_pred_Q14 = 0;
-        }
-
-        cout "czb " + LTP_pred_Q14;
-
-        /* Long-term shaping */
-        if( lag > 0 ) {
-            /* Symmetric, packed FIR coefficients */
-            n_LTP_Q14 = SKP_SMULWB( SKP_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
-            n_LTP_Q14 = SKP_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ],                     HarmShapeFIRPacked_Q14 );
-            n_LTP_Q14 = SKP_LSHIFT( n_LTP_Q14, 6 );
-            shp_lag_ptr++;
-        } else if(lag > 0 && n_LTP_Q14 < shp_lag_ptr) {
-            n_LTP_Q14 = SKP_LSHIFT( n_LTP_Q14,  n_LTP_Q14<<);
-        } else {
-            n_LTP_Q14 = 0;
-        }
-
-        cout "czb " + n_LTP_Q14;
-
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            /* Delayed decision state */
-            psDD = &psDelDec[ k ];
-
-            /* Sample state */
-            psSS = psSampleState[ k ];
-
-            /* Generate dither */
-            psDD->Seed = SKP_RAND( psDD->Seed );
-
-            /* dither = rand_seed < 0 ? 0xFFFFFFFF : 0; */
-            dither = SKP_RSHIFT( psDD->Seed, 31 );
-
-            /* Pointer used in short term prediction and shaping */
-            psLPC_Q14 = &psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 + i ];
-            /* Short-term prediction */
-            SKP_assert( ( predictLPCOrder  & 1 ) == 0 );    /* check that order is even */
-            SKP_assert( ( (SKP_int64)a_Q12 & 3 ) == 0 );    /* check that array starts at 4-byte aligned address */
-            SKP_assert( predictLPCOrder >= 10 );            /* check that unrolling works */
-
-            /* Partially unrolled */
-            Atmp = a_Q12_tmp[ 0 ];          /* read two coefficients at once */
-            LPC_pred_Q10 = SKP_SMULWB(               psLPC_Q14[ 0  ], Atmp );
-            LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -1 ], Atmp );
-            Atmp = a_Q12_tmp[ 1 ];
-            LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ -2 ], Atmp );
-            LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -3 ], Atmp );
-            Atmp = a_Q12_tmp[ 2 ];
-            LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ -4 ], Atmp );
-            LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -5 ], Atmp );
-            Atmp = a_Q12_tmp[ 3 ];
-            LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ -6 ], Atmp );
-            LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -7 ], Atmp );
-            Atmp = a_Q12_tmp[ 4 ];
-            LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ -8 ], Atmp );
-            LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -9 ], Atmp );
-
-            /*for( j = 10; j < predictLPCOrder; j += 2 ) {
-                Atmp = a_Q12_tmp[ j >> 1 ]; *//* read two coefficients at once *//*
-                LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ -j     ], Atmp );
-                LPC_pred_Q10 = SKP_SMLAWT( LPC_pred_Q10, psLPC_Q14[ -j - 1 ], Atmp );
-            }*/
-
-            LPC_pred_Q10 = SKP_SMLAWB( LPC_pred_Q10, psLPC_Q14[ 0], Atmp );
-            cout "czb " + LPC_pred_Q10;
-
-            /* Noise shape feedback */
-            SKP_assert( ( shapingLPCOrder       & 1 ) == 0 );   /* check that order is even */
-            SKP_assert( ( (SKP_int64)AR_shp_Q13 & 3 ) == 0 );   /* check that array starts at 4-byte aligned address */
-            SKP_assert( shapingLPCOrder >= 12 );                /* check that unrolling works */
-
-            /* Partially unrolled */
-            Atmp = AR_shp_Q13_tmp[ 0 ];         /* read two coefficients at once */
-            n_AR_Q10 = SKP_SMULWB(           psLPC_Q14[ 0  ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -1 ], Atmp );
-            Atmp = AR_shp_Q13_tmp[ 1 ];
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -2 ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -3 ], Atmp );
-            Atmp = AR_shp_Q13_tmp[ 2 ];
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -4 ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -5 ], Atmp );
-            Atmp = AR_shp_Q13_tmp[ 3 ];
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -6 ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -7 ], Atmp );
-            Atmp = AR_shp_Q13_tmp[ 4 ];
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -8 ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -9 ], Atmp );
-            Atmp = AR_shp_Q13_tmp[ 5 ];
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -10 ], Atmp );
-            n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -11 ], Atmp );
-            for( j = 12; j < shapingLPCOrder; j += 2 ) {
-                Atmp = AR_shp_Q13_tmp[ j >> 1 ];        /* read two coefficients at once */
-                n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psLPC_Q14[ -j     ], Atmp );
-                n_AR_Q10 = SKP_SMLAWT( n_AR_Q10, psLPC_Q14[ -j - 1 ], Atmp );
-            }
-            n_AR_Q10 = SKP_RSHIFT( n_AR_Q10, 1 );           /* Q11 -> Q10 */
-            n_AR_Q10 = SKP_SMLAWB( n_AR_Q10, psDD->LF_AR_Q12, Tilt_Q14 );
-
-            n_LF_Q10   = SKP_LSHIFT( SKP_SMULWB( psDD->Shape_Q10[ *smpl_buf_idx ], LF_shp_Q14 ), 2 );
-            n_LF_Q10   = SKP_SMLAWT( n_LF_Q10, psDD->LF_AR_Q12, LF_shp_Q14 );
-
-            /* Input minus prediction plus noise feedback                       */
-            /* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP  */
-            tmp   = SKP_SUB32( LTP_pred_Q14, n_LTP_Q14 );                       /* Add Q14 stuff */
-            tmp   = SKP_RSHIFT_ROUND( tmp, 4 );                                 /* round to Q10  */
-            tmp   = SKP_ADD32( tmp, LPC_pred_Q10 );                             /* add Q10 stuff */
-            tmp   = SKP_SUB32( tmp, n_AR_Q10 );                                 /* subtract Q10 stuff */
-            tmp   = SKP_SUB32( tmp, n_LF_Q10 );                                 /* subtract Q10 stuff */
-            r_Q10 = SKP_SUB32( x_Q10[ i ], tmp );                               /* residual error Q10 */
-
-            r_Q10 = ( r_Q10 ^ dither ) - dither;
-            r_Q10 = SKP_SUB32( r_Q10, offset_Q10 );
-            r_Q10 = SKP_LIMIT( r_Q10, -64 << 10, 64 << 10 );
-
-            if( r_Q10 < -1536 ) {
-                q1_Q10  = SKP_LSHIFT( SKP_RSHIFT_ROUND( r_Q10, 10 ), 10 );
-                r_Q10   = SKP_SUB32( r_Q10, q1_Q10 );
-                rd1_Q10 = SKP_RSHIFT( SKP_SMLABB( SKP_MUL( -SKP_ADD32( q1_Q10, offset_Q10 ), Lambda_Q10 ), r_Q10, r_Q10 ), 10 );
-                rd2_Q10 = SKP_ADD32( rd1_Q10, 1024 );
-                rd2_Q10 = SKP_SUB32( rd2_Q10, SKP_ADD_LSHIFT32( Lambda_Q10, r_Q10, 1 ) );
-                q2_Q10  = SKP_ADD32( q1_Q10, 1024 );
-            } else if( r_Q10 > 512 ) {
-                q1_Q10  = SKP_LSHIFT( SKP_RSHIFT_ROUND( r_Q10, 10 ), 10 );
-                r_Q10   = SKP_SUB32( r_Q10, q1_Q10 );
-                rd1_Q10 = SKP_RSHIFT( SKP_SMLABB( SKP_MUL( SKP_ADD32( q1_Q10, offset_Q10 ), Lambda_Q10 ), r_Q10, r_Q10 ), 10 );
-                rd2_Q10 = SKP_ADD32( rd1_Q10, 1024 );
-                rd2_Q10 = SKP_SUB32( rd2_Q10, SKP_SUB_LSHIFT32( Lambda_Q10, r_Q10, 1 ) );
-                q2_Q10  = SKP_SUB32( q1_Q10, 1024 );
-            } else {            /* r_Q10 >= -1536 && q1_Q10 <= 512 */
-                rr_Q20  = SKP_SMULBB( offset_Q10, Lambda_Q10 );
-                rd2_Q10 = SKP_RSHIFT( SKP_SMLABB( rr_Q20, r_Q10, r_Q10 ), 10 );
-                rd1_Q10 = SKP_ADD32( rd2_Q10, 1024 );
-                rd1_Q10 = SKP_ADD32( rd1_Q10, SKP_SUB_RSHIFT32( SKP_ADD_LSHIFT32( Lambda_Q10, r_Q10, 1 ), rr_Q20, 9 ) );
-                q1_Q10  = -1024;
-                q2_Q10  = 0;
-            }
-
-            if( rd1_Q10 < rd2_Q10 ) {
-                psSS[ 0 ].RD_Q10 = SKP_ADD32( psDD->RD_Q10, rd1_Q10 );
-                psSS[ 1 ].RD_Q10 = SKP_ADD32( psDD->RD_Q10, rd2_Q10 );
-                psSS[ 0 ].Q_Q10 = q1_Q10;
-                psSS[ 1 ].Q_Q10 = q2_Q10;
-            } else {
-                psSS[ 0 ].RD_Q10 = SKP_ADD32( psDD->RD_Q10, rd2_Q10 );
-                psSS[ 1 ].RD_Q10 = SKP_ADD32( psDD->RD_Q10, rd1_Q10 );
-                psSS[ 0 ].Q_Q10 = q2_Q10;
-                psSS[ 1 ].Q_Q10 = q1_Q10;
-            }
-
-            /* Update states for best quantization */
-
-            /* Quantized excitation */
-            exc_Q10 = SKP_ADD32( offset_Q10, psSS[ 0 ].Q_Q10 );
-            exc_Q10 = ( exc_Q10 ^ dither ) - dither;
-
-            /* Add predictions */
-            LPC_exc_Q10 = exc_Q10 + SKP_RSHIFT_ROUND( LTP_pred_Q14, 4 );
-            xq_Q10      = SKP_ADD32( LPC_exc_Q10, LPC_pred_Q10 );
-
-            /* Update states */
-            sLF_AR_shp_Q10         = SKP_SUB32(  xq_Q10, n_AR_Q10 );
-            psSS[ 0 ].sLTP_shp_Q10 = SKP_SUB32(  sLF_AR_shp_Q10, n_LF_Q10 );
-            psSS[ 0 ].LF_AR_Q12    = SKP_LSHIFT( sLF_AR_shp_Q10, 2 );
-            psSS[ 0 ].xq_Q14       = SKP_LSHIFT( xq_Q10,         4 );
-            psSS[ 0 ].LPC_exc_Q16  = SKP_LSHIFT( LPC_exc_Q10,    6 );
-
-            /* Update states for second best quantization */
-
-            /* Quantized excitation */
-            exc_Q10 = SKP_ADD32( offset_Q10, psSS[ 1 ].Q_Q10 );
-            exc_Q10 = ( exc_Q10 ^ dither ) - dither;
-
-            /* Add predictions */
-            LPC_exc_Q10 = exc_Q10 + SKP_RSHIFT_ROUND( LTP_pred_Q14, 4 );
-            xq_Q10      = SKP_ADD32( LPC_exc_Q10, LPC_pred_Q10 );
-
-            /* Update states */
-            sLF_AR_shp_Q10         = SKP_SUB32(  xq_Q10, n_AR_Q10 );
-            psSS[ 1 ].sLTP_shp_Q10 = SKP_SUB32(  sLF_AR_shp_Q10, n_LF_Q10 );
-            psSS[ 1 ].LF_AR_Q12    = SKP_LSHIFT( sLF_AR_shp_Q10, 2 );
-            psSS[ 1 ].xq_Q14       = SKP_LSHIFT( xq_Q10,         4 );
-            psSS[ 1 ].LPC_exc_Q16  = SKP_LSHIFT( LPC_exc_Q10,    6 );
-        }
-
-        *smpl_buf_idx  = ( *smpl_buf_idx - 1 ) & DECISION_DELAY_MASK;                   /* Index to newest samples              */
-        last_smple_idx = ( *smpl_buf_idx + decisionDelay ) & DECISION_DELAY_MASK;       /* Index to decisionDelay old samples   */
-
-        /* Find winner */
-        RDmin_Q10 = psSampleState[ 0 ][ 0 ].RD_Q10;
-        Winner_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
-            if( psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10 ) {
-                RDmin_Q10   = psSampleState[ k ][ 0 ].RD_Q10;
-                Winner_ind = k;
-            }
-        }
-
-        /* Increase RD values of expired states */
-        Winner_rand_state = psDelDec[ Winner_ind ].RandState[ last_smple_idx ];
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            if( psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state ) {
-                psSampleState[ k ][ 0 ].RD_Q10 = SKP_ADD32( psSampleState[ k ][ 0 ].RD_Q10, ( SKP_int32_MAX >> 4 ) );
-                psSampleState[ k ][ 1 ].RD_Q10 = SKP_ADD32( psSampleState[ k ][ 1 ].RD_Q10, ( SKP_int32_MAX >> 4 ) );
-                SKP_assert( psSampleState[ k ][ 0 ].RD_Q10 >= 0 );
-            }
-        }
-
-        /* Find worst in first set and best in second set */
-        RDmax_Q10  = psSampleState[ 0 ][ 0 ].RD_Q10;
-        RDmin_Q10  = psSampleState[ 0 ][ 1 ].RD_Q10;
-        RDmax_ind = 0;
-        RDmin_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
-            /* find worst in first set */
-            if( psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10 ) {
-                RDmax_Q10  = psSampleState[ k ][ 0 ].RD_Q10;
-                RDmax_ind = k;
-            }
-            /* find best in second set */
-            if( psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10 ) {
-                RDmin_Q10  = psSampleState[ k ][ 1 ].RD_Q10;
-                RDmin_ind = k;
-            }
-        }
-
-        cout "czb " + RDmax_Q10;
-
-        /* Replace a state if best from second set outperforms worst in first set */
-        if( RDmin_Q10 < RDmax_Q10 ) {
-            SKP_Silk_copy_del_dec_state( &psDelDec[ RDmax_ind ], &psDelDec[ RDmin_ind ], i );
-            SKP_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) );
-        }
-
-        /* Write samples from winner to output and long-term filter states */
-        psDD = &psDelDec[ Winner_ind ];
-        if( subfr > 0 || i >= decisionDelay ) {
-            q[  i - decisionDelay ] = ( SKP_int )SKP_RSHIFT( psDD->Q_Q10[ last_smple_idx ], 10 );
-            xq[ i - decisionDelay ] = ( SKP_int16 )SKP_SAT16( SKP_RSHIFT_ROUND(
-                    SKP_SMULWW( psDD->Xq_Q10[ last_smple_idx ], psDD->Gain_Q16[ last_smple_idx ] ), 10 ) );
-            NSQ->sLTP_shp_Q10[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q10[ last_smple_idx ];
-            sLTP_Q16[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDD->Pred_Q16[  last_smple_idx ];
-        }
-        NSQ->sLTP_shp_buf_idx++;
-        NSQ->sLTP_buf_idx++;
-
-        /* Update states */
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            psDD                                     = &psDelDec[ k ];
-            psSS                                     = &psSampleState[ k ][ 0 ];
-            psDD->LF_AR_Q12                          = psSS->LF_AR_Q12;
-            psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH + i ] = psSS->xq_Q14;
-            psDD->Xq_Q10[    *smpl_buf_idx ]         = SKP_RSHIFT( psSS->xq_Q14, 4 );
-            psDD->Q_Q10[     *smpl_buf_idx ]         = psSS->Q_Q10;
-            psDD->Pred_Q16[  *smpl_buf_idx ]         = psSS->LPC_exc_Q16;
-            psDD->Shape_Q10[ *smpl_buf_idx ]         = psSS->sLTP_shp_Q10;
-            psDD->Seed                               = SKP_ADD_RSHIFT32( psDD->Seed, psSS->Q_Q10, 10 );
-            psDD->RandState[ *smpl_buf_idx ]         = psDD->Seed;
-            psDD->RD_Q10                             = psSS->RD_Q10;
-            psDD->Gain_Q16[  *smpl_buf_idx ]         = Gain_Q16;
-        }
-    }
-    /* Update LPC states */
-    for( k = 0; k < nStatesDelayedDecision; k++ ) {
-        psDD = &psDelDec[ k ];
-        SKP_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( SKP_int32 ) );
-    }
-}
-
-SKP_INLINE void SKP_Silk_nsq_del_dec_scale_states(
-        SKP_Silk_nsq_state  *NSQ,                   /* I/O  NSQ state                           */
-        NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-        const SKP_int16     x[],                    /* I    Input in Q0                         */
-        SKP_int32           x_sc_Q10[],             /* O    Input scaled with 1/Gain in Q10     */
-        SKP_int             length,                 /* I    Length of input                     */
-        SKP_int16           sLTP[],                 /* I    Re-whitened LTP state in Q0         */
-        SKP_int32           sLTP_Q16[],             /* O    LTP state matching scaled input     */
-        SKP_int             subfr,                  /* I    Subframe number                     */
-        SKP_int             nStatesDelayedDecision, /* I    Number of del dec states            */
-        SKP_int             smpl_buf_idx,           /* I    Index to newest samples in buffers  */
-        const SKP_int       LTP_scale_Q14,          /* I    LTP state scaling                   */
-        const SKP_int32     Gains_Q16[ NB_SUBFR ],  /* I                                        */
-        const SKP_int       pitchL[ NB_SUBFR ]      /* I    Pitch lag                           */
-)
-{
-    SKP_int            i, k, scale_length, lag;
-    SKP_int32          inv_gain_Q16, gain_adj_Q16, inv_gain_Q32;
-    NSQ_del_dec_struct *psDD;
-
-    inv_gain_Q16 = SKP_DIV32( SKP_int32_MAX, SKP_RSHIFT( Gains_Q16[ subfr ], 1 ) );
-    inv_gain_Q16 = SKP_min( inv_gain_Q16, SKP_int16_MAX );
-    lag          = pitchL[ subfr ];
-    /* After rewhitening the LTP state is un-scaled. So scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        inv_gain_Q32 = SKP_LSHIFT( inv_gain_Q16, 16 );
-        if( subfr == 0 ) {
-            /* Do LTP downscaling */
-            inv_gain_Q32 = SKP_LSHIFT( SKP_SMULWB( inv_gain_Q32, LTP_scale_Q14 ), 2 );
-        }
-        for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
-            SKP_assert( i < MAX_FRAME_LENGTH );
-            sLTP_Q16[ i ] = SKP_SMULWB( inv_gain_Q32, sLTP[ i ] );
-        }
-    }
-
-    /* Adjust for changing gain */
-    if( inv_gain_Q16 != NSQ->prev_inv_gain_Q16 ) {
-        gain_adj_Q16 = SKP_DIV32_varQ( inv_gain_Q16, NSQ->prev_inv_gain_Q16, 16 );
-
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            psDD = &psDelDec[ k ];
-
-            /* Scale scalar states */
-            psDD->LF_AR_Q12 = SKP_SMULWW( gain_adj_Q16, psDD->LF_AR_Q12 );
-
-            /* scale short term state */
-            for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
-                psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - i - 1 ] = SKP_SMULWW( gain_adj_Q16, psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - i - 1 ] );
-            }
-            for( i = 0; i < DECISION_DELAY; i++ ) {
-                psDD->Pred_Q16[  i ] = SKP_SMULWW( gain_adj_Q16, psDD->Pred_Q16[  i ] );
-                psDD->Shape_Q10[ i ] = SKP_SMULWW( gain_adj_Q16, psDD->Shape_Q10[ i ] );
-            }
-        }
-
-        ostream& operator<<(ostream& psDD);
-
-        /* Scale long term shaping state */
-
-        /* Calculate length to be scaled, Worst case: Next frame is voiced with max lag */
-        scale_length = length * NB_SUBFR;                                               /* aprox max lag */
-        scale_length = scale_length - SKP_SMULBB( NB_SUBFR - ( subfr + 1 ), length );   /* subtract samples that will be too old in next frame */
-        scale_length = SKP_max_int( scale_length, lag + LTP_ORDER );                    /* make sure to scale whole pitch period if voiced */
-
-        for( i = NSQ->sLTP_shp_buf_idx - scale_length; i < NSQ->sLTP_shp_buf_idx; i++ ) {
-            NSQ->sLTP_shp_Q10[ i ] = SKP_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q10[ i ] );
-        }
-
-        /* Scale LTP predict state */
-        if( NSQ->rewhite_flag == 0 ) {
-            for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
-                sLTP_Q16[ i ] = SKP_SMULWW( gain_adj_Q16, sLTP_Q16[ i ] );
-            }
-        }
-    }
-
-    /* Scale input */
-    for( i = 0; i < length; i++ ) {
-        x_sc_Q10[ i ] = SKP_RSHIFT( SKP_SMULBB( x[ i ], ( SKP_int16 )inv_gain_Q16 ), 6 );
-    }
-
-    /* save inv_gain */
-    SKP_assert( inv_gain_Q16 != 0 );
-    NSQ->prev_inv_gain_Q16 = inv_gain_Q16;
-}
-
-SKP_INLINE void SKP_Silk_copy_del_dec_state(
-        NSQ_del_dec_struct  *DD_dst, // 目标
-        NSQ_del_dec_struct  *DD_src, // 源
-        SKP_int             LPC_state_idx
-)
-{
-    SKP_memcpy( DD_dst->RandState, DD_src->RandState,   DECISION_DELAY * sizeof( SKP_int   ) );
-    SKP_memcpy( DD_dst->Q_Q10,     DD_src->Q_Q10,       DECISION_DELAY * sizeof( SKP_int32 ) );
-    SKP_memcpy( DD_dst->Pred_Q16,  DD_src->Pred_Q16,    DECISION_DELAY * sizeof( SKP_int32 ) );
-    SKP_memcpy( DD_dst->Shape_Q10, DD_src->Shape_Q10,   DECISION_DELAY * sizeof( SKP_int32 ) );
-    SKP_memcpy( DD_dst->Xq_Q10,    DD_src->Xq_Q10,      DECISION_DELAY * sizeof( SKP_int32 ) );
-
-    SKP_memcpy( &DD_dst->sLPC_Q14[ LPC_state_idx ], &DD_src->sLPC_Q14[ LPC_state_idx ], NSQ_LPC_BUF_LENGTH * sizeof( SKP_int32 ) );
-    DD_dst->LF_AR_Q12 = DD_src->LF_AR_Q12;
-    DD_dst->Seed      = DD_src->Seed;
-    DD_dst->SeedInit  = DD_src->SeedInit;
-    DD_dst->RD_Q10    = DD_src->RD_Q10;
-
-    // TODO
-    // 释放源资源
-}

android/app/src/main/cpp/common/coomon_utils.h

@@ -1,13 +0,0 @@
-#ifndef ANDROIDRECORDER_COOMON_UTILS_H
-#define ANDROIDRECORDER_COOMON_UTILS_H
-
-#include <sys/time.h>
-
-static inline long getCurrentTime()
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000 + tv.tv_usec/1000;
-}
-
-#endif //ANDROIDRECORDER_COOMON_UTILS_H

android/app/src/main/cpp/common/message_handler.cpp

@@ -1,18 +0,0 @@
-#include "message_handler.h"
-
-Handler::Handler(MessageQueue *queue) {
-    this->mQueue = queue;
-}
-
-Handler::~Handler() {
-
-}
-
-int Handler::postMessage(Message *msg) {
-    msg->handler = this;
-    return mQueue->enqueueMessage(msg);
-}
-
-int Handler::getQueueSize() {
-    return mQueue->size();
-}

android/app/src/main/cpp/common/message_handler.h

@@ -1,23 +0,0 @@
-
-#ifndef ANDROIDRECORDER_HANDLER_H
-#define ANDROIDRECORDER_HANDLER_H
-
-#include "message_queue.h"
-class Message;
-class MessageQueue;
-
-class Handler{
-private:
-    MessageQueue* mQueue;
-
-public:
-    Handler(MessageQueue* mQueue);
-    ~Handler();
-
-    int postMessage(Message* msg);
-    int getQueueSize();
-    virtual void handleMessage(Message* msg){};
-
-};
-
-#endif //ANDROIDRECORDER_HANDLER_H

android/app/src/main/cpp/common/message_queue.cpp

@@ -1,154 +0,0 @@
-
-#include "message_queue.h"
-#include "message_handler.h"
-
-MessageQueue::MessageQueue() {
-    init();
-}
-
-MessageQueue::MessageQueue(const char* queueNameParam){
-    init();
-    queueName = queueNameParam;
-}
-
-void MessageQueue::init(){
-    pthread_mutex_init(&mLock, NULL);
-    pthread_cond_init(&mCondition, NULL);
-    mNbPackets = 0;
-    mFirst = NULL;
-    mLast = NULL;
-    mAbortRequest = false;
-}
-
-MessageQueue::~MessageQueue() {
-    flush();
-    pthread_mutex_destroy(&mLock);
-    pthread_cond_destroy(&mCondition);
-}
-
-int MessageQueue::size() {
-    pthread_mutex_destroy(&mLock);
-    int size = mNbPackets;
-    pthread_mutex_unlock(&mLock);
-    return size;
-}
-
-void MessageQueue::flush() {
-    MessageNode *curNode, *nextNode;
-    Message *msg;
-    pthread_mutex_lock(&mLock);
-    for(curNode = mFirst; curNode != NULL; curNode = nextNode){
-        nextNode = curNode->next;
-        msg = curNode->msg;
-        if(NULL != msg){
-            delete msg;
-        }
-        delete curNode;
-        curNode = NULL;
-    }
-    mLast = NULL;
-    mFirst = NULL;
-    pthread_mutex_unlock(&mLock);
-}
-
-int MessageQueue::enqueueMessage(Message *msg) {
-    if(mAbortRequest){
-        delete msg;
-        return -1;
-    }
-
-    MessageNode *node = new MessageNode();
-    node->msg = msg;
-    node->next = NULL;
-
-    if(mLast == NULL){
-        mFirst = node;
-    }else{
-        mLast->next = node;
-    }
-    mLast = node;
-    mNbPackets++;
-    pthread_cond_signal(&mCondition);
-    pthread_mutex_unlock(&mLock);
-    return 0;
-}
-
-int MessageQueue::dequeueMessage(Message **msg, bool block) {
-    MessageNode *node;
-    int ret;
-    pthread_mutex_lock(&mLock);
-    for (;;) {
-        if (mAbortRequest) {
-            ret = -1;
-            break;
-        }
-        node = mFirst;
-        if (node) {
-            mFirst = node->next;
-            if (!mFirst)
-                mLast = NULL;
-            mNbPackets--;
-            *msg = node->msg;
-            delete node;
-            node = NULL;
-            ret = 1;
-            break;
-        } else if (!block) {
-            ret = 0;
-            break;
-        } else {
-            pthread_cond_wait(&mCondition, &mLock);
-        }
-    }
-    pthread_mutex_unlock(&mLock);
-    return ret;
-}
-
-void MessageQueue::abort() {
-    pthread_mutex_lock(&mLock);
-    mAbortRequest = true;
-    pthread_cond_signal(&mCondition);
-    pthread_mutex_unlock(&mLock);
-}
-
-
-/******************* Message class *******************/
-Message::Message() {
-    handler = NULL;
-}
-
-Message::Message(int what){
-    handler = NULL;
-    this->what = what;
-}
-Message::Message(int what, int arg1, int arg2) {
-    handler = NULL;
-    this->what = what;
-    this->arg1 = arg1;
-    this->arg2 = arg2;
-}
-Message::Message(int what, void* obj) {
-    handler = NULL;
-    this->what = what;
-    this->obj = obj;
-}
-Message::Message(int what, int arg1, int arg2, void* obj) {
-    handler = NULL;
-    this->what = what;
-    this->arg1 = arg1;
-    this->arg2 = arg2;
-    this->obj = obj;
-}
-Message::~Message() {
-}
-
-int Message::execute(){
-    if (MESSAGE_QUEUE_LOOP_QUIT_FLAG == what) {
-        return MESSAGE_QUEUE_LOOP_QUIT_FLAG;
-    } else if (handler) {
-        handler->handleMessage(this);
-        return 1;
-    }
-    return 0;
-};
-

android/app/src/main/cpp/common/message_queue.h

@@ -1,81 +0,0 @@
-
-#ifndef ANDROIDRECORDER_MESSAGE_QUEUE_H
-#define ANDROIDRECORDER_MESSAGE_QUEUE_H
-
-#include <pthread.h>
-#include <sys/types.h>
-#include "message_handler.h"
-#include "../log_utils.h"
-
-#define MESSAGE_QUEUE_LOOP_QUIT_FLAG        19900909
-
-class Handler;
-
-class Message{
-private:
-    int what;
-    int arg1;
-    int arg2;
-    void *obj;
-
-public:
-    Message();
-    Message(int what);
-    Message(int what, int arg1, int arg2);
-    Message(int what, void *obj);
-    Message(int what, int arg1, int arg2, void *obj);
-    ~Message();
-
-    int execute();
-    int getWhat(){
-        return what;
-    }
-
-    int getArg1(){
-        return arg1;
-    }
-
-    int getArg2(){
-        return arg2;
-    }
-
-    void* getObj(){
-        return obj;
-    }
-
-    Handler *handler;
-};
-
-typedef struct MessageNode{
-    Message *msg;
-    struct MessageNode *next;
-    MessageNode(){
-        msg = NULL;
-        next = NULL;
-    }
-} MessageNode;
-
-class MessageQueue{
-private :
-    MessageNode* mFirst;
-    MessageNode* mLast;
-    int mNbPackets;
-    bool mAbortRequest;
-    pthread_mutex_t mLock;
-    pthread_cond_t mCondition;
-    const char * queueName;
-
-public:
-    MessageQueue();
-    MessageQueue(const char* queueNameParam);
-    ~MessageQueue();
-
-    void init();
-    void flush();
-    int enqueueMessage(Message* msg);
-    int dequeueMessage(Message **msg, bool block);
-    int size();
-    void abort();
-};
-
-#endif //ANDROIDRECORDER_MESSAGE_QUEUE_H

android/app/src/main/cpp/controller.cpp

@@ -1,340 +0,0 @@
-#include "controller.h"
-#include "log_utils.h"
-
-Controller::Controller() {
-    facingId = CAMERA_FACING_FRONT;
-
-    startTime = -1;
-    eglCore= NULL;
-    _window = NULL;
-    isThreadCreateSucceed = false;
-    previewSurface = EGL_NO_SURFACE;
-    isEncoding = false;
-    queue = new MessageQueue("controller message queue");
-    handler = new PreviewHandler(this,queue);
-}
-
-Controller::~Controller() {
-
-}
-
-bool Controller::init() {
-    LOGI("Controller::init start!");
-
-    eglCore = new EGLCore();
-    eglCore->init();
-    createPreviewSurface();
-    buildRenderInstance();
-    configCamera();
-    render->init(degress, facingId == CAMERA_FACING_FRONT, textureWidth, textureHeight, cameraWidth, cameraHeight);
-    startCameraPreview();
-
-    isInSwitchingCamera = false;
-
-    LOGI("Controller::init finish!");
-    return true;
-}
-
-void Controller::destroyEGLContext()
-{
-    if(handler){
-        handler->postMessage(new Message(MSG_EGL_THREAD_EXIT));
-        handler->postMessage(new Message(MESSAGE_QUEUE_LOOP_QUIT_FLAG));
-    }
-
-    if(isThreadCreateSucceed){
-        pthread_join(_threadId, 0);
-    }
-
-    if(queue){
-        queue->abort();
-        delete queue;
-        queue = NULL;
-    }
-    if(handler){
-        delete handler;
-        handler = NULL;
-    }
-}
-
-void Controller::destroy(){
-    destroyPreviewSurface();
-    if(render){
-        render->dealloc();
-        delete render;
-        render = NULL;
-    }
-    releaseCamera();
-    eglCore->release();
-    delete eglCore;
-    eglCore = NULL;
-}
-
-void Controller::createPreviewSurface() {
-    previewSurface = eglCore->createWindowSurface(_window);
-    if(previewSurface != NULL){
-        eglCore->makeCurrent(previewSurface);
-    }
-}
-
-void Controller::destroyPreviewSurface(){
-
-}
-
-void Controller::switchCamera(){
-    isInSwitchingCamera = true;
-    if(facingId == CAMERA_FACING_BACK){
-        facingId = CAMERA_FACING_FRONT;
-    } else {
-        facingId = CAMERA_FACING_BACK;
-    }
-
-    if(handler){
-        handler->postMessage(new Message(MSG_SWITCH_CAMERA));
-    }
-}
-
-void Controller::switchCameraFromMessage()
-{
-    releaseCamera();
-    configCamera();
-    render->setDegress(degress, facingId == CAMERA_FACING_FRONT);
-    startCameraPreview();
-    isInSwitchingCamera = false;
-}
-
-void Controller::releaseCamera(){
-    JNIEnv *env;
-
-    if(jvm->AttachCurrentThread(&env, NULL) != JNI_OK){
-        return;
-    }
-
-    if(env == NULL){
-        return;
-    }
-
-    jclass jcls = env->GetObjectClass(obj);
-    if(NULL != jcls){
-        jmethodID  releaseCameraCallback = env->GetMethodID(jcls, "releaseCameraFromNative","()V");
-        if(NULL != releaseCameraCallback){
-            env->CallVoidMethod(obj, releaseCameraCallback);
-        }
-    }
-
-    jvm->DetachCurrentThread();
-}
-
-void Controller::startRecording(){
-
-}
-
-void Controller::stopRecording(){
-
-}
-
-void Controller::prepareEGLContext(ANativeWindow *window, JavaVM *jvm, jobject obj, int screenWidth,
-                                   int screenHeight, int cameraFacingId) {
-
-    LOGI("Controller::prepare start!");
-    this->jvm = jvm;
-    this->obj = obj;
-    this->_window = window;
-    this->screenWidth = screenWidth;
-    this->screenHeight = screenHeight;
-    this->facingId = cameraFacingId;
-
-    handler->postMessage(new Message(MSG_EGL_THREAD_CREATE));
-    int res_code = pthread_create(&_threadId, 0, threadStartCallBack, this);
-    if(res_code == 0){
-        isThreadCreateSucceed = true;
-    }
-
-    LOGI("Controller::prepare finish!");
-}
-
-void *Controller::threadStartCallBack(void *myself) {
-    LOGI("Controller::threadStartCallBack start");
-    Controller *controller = (Controller *) myself;
-    controller->processMessage();
-    pthread_exit(0);
-    LOGI("Controller::threadStartCallBack finish");
-}
-
-void Controller::processMessage() {
-    bool renderingEnabled = true;
-    while(renderingEnabled){
-        Message *msg = NULL;
-        if(queue->dequeueMessage(&msg, true) > 0){
-            if(MESSAGE_QUEUE_LOOP_QUIT_FLAG == msg->execute()){
-                renderingEnabled = false;
-            }
-            delete msg;
-        }
-    }
-}
-
-void Controller::configCamera() {
-    LOGI("Controller::configCamera enter");
-    JNIEnv *env;
-
-    if(env == NULL){
-        LOGE("getJNIEnv failed");
-        return;
-    }
-
-    if(jvm->AttachCurrentThread(&env, NULL) != JNI_OK){
-        LOGE("AttachCurrentThread failed");
-        return;
-    }
-
-    jclass jcls = env->GetObjectClass(obj);
-    if(NULL == jcls){
-        return;
-    }
-
-    //(I)Lcom/yeliang/recorder/CameraConfigInfo") ---> (I)是形参，后面的是返回值
-    jmethodID configCameraCallback = env->GetMethodID(jcls, "configCameraFromNative", "(I)Lcom/yeliang/recorder/CameraConfigInfo;");
-    if(configCameraCallback == NULL){
-        return;
-    }
-
-    //1 调用PreviewScheduler类中的configCameraFromNative方法 返回CameraConfigInfo对象
-    jobject  cameraConfigInfo = env->CallObjectMethod(obj, configCameraCallback, facingId);
-
-    //2 根据CameraConfigInfo对象，获取CameraConfigInfo类
-    jclass CameraConfigInfo_cls = env->GetObjectClass(cameraConfigInfo);
-
-    //3 通过CameraConfigInfo_cls 获取 CameraConfigInfo中的getDegress方法
-    jmethodID getDegress_method = env->GetMethodID(CameraConfigInfo_cls, "getDegress","()I");
-    degress = env->CallIntMethod(cameraConfigInfo, getDegress_method);
-
-    jmethodID getCamereFacingId_method = env->GetMethodID(CameraConfigInfo_cls, "getCameraFacingId","()I");
-    facingId = env->CallIntMethod(cameraConfigInfo, getCamereFacingId_method);
-    
-    jmethodID getTextureWidth_method = env->GetMethodID(CameraConfigInfo_cls, "getTextureWidth","()I");
-    int previewWidth = env->CallIntMethod(cameraConfigInfo, getTextureWidth_method);
-    cameraWidth = previewWidth;
-
-    jmethodID getTextureHeight_method = env->GetMethodID(CameraConfigInfo_cls, "getTextureHeight","()I");
-    int previewHeight = env->CallIntMethod(cameraConfigInfo, getTextureHeight_method);
-    cameraHeight = previewHeight;
-
-    cameraWidth = 1280;
-    cameraHeight = 720;
-
-    textureWidth = 720;
-    textureHeight = 1280;
-
-    LOGI("camera:{previewWidth = %d, previewHeight = %d}", cameraWidth, cameraHeight);
-    LOGI("Texture: {textureWidth = %d, textureHeight = %d}",textureWidth, textureHeight);
-
-    jvm->DetachCurrentThread();
-    LOGI("Controller::configCamera leave");
-}
-
-void Controller::startCameraPreview() {
-    JNIEnv *env;
-    if(jvm->AttachCurrentThread(&env, NULL) != JNI_OK){
-        return;
-    }
-
-    if(env == NULL){
-        return;
-    }
-
-    jclass jcls = env->GetObjectClass(obj);
-
-    if(NULL != jcls){
-        jmethodID  startPreviewMethod = env->GetMethodID(jcls, "startPreviewFromNative", "(I)V");
-        if(NULL != startPreviewMethod){
-            env->CallVoidMethod(obj, startPreviewMethod, render->getCameraTexId());
-        }
-    }
-
-    if(jvm->DetachCurrentThread() != JNI_OK){
-        LOGE("DetachCurrentThread Error!");
-        return;
-    }
-}
-
-void Controller::createWindowSurface(ANativeWindow *window) {
-    if(_window == NULL){
-        _window = window;
-        if(handler){
-            handler->postMessage(new Message(MSG_EGL_CREATE_PREVIEW_SURFACE));
-        }
-    }
-}
-
-void Controller::notifyFrameAvaliable()
-{
-        if(handler && !isInSwitchingCamera){
-            handler->postMessage(new Message(MSG_RENDER_FRAME));
-        }
-}
-
-void Controller::renderFrame()
-{
-        if(NULL != eglCore && !isInSwitchingCamera){
-                if(startTime == -1){
-                    startTime = getCurrentTime();
-                }
-
-            float position = ((float)(getCurrentTime() - startTime)) / 1000.0f;
-            processVideoFrame(position);
-            if(previewSurface != EGL_NO_SURFACE){
-                draw();
-            }
-
-            if(isEncoding){
-            }
-        }
-}
-
-void Controller::processVideoFrame(float position)
-{
-    updateTexImage();
-    render->processFrame(position);
-}
-
-void Controller::updateTexImage()
-{
-    JNIEnv *env;
-    if(jvm->AttachCurrentThread(&env, NULL) != JNI_OK){
-        return;
-    }
-
-    if(env == NULL){
-        return;
-    }
-
-    jclass jcls = env->GetObjectClass(obj);
-
-    printf("Controller::updateTexImage &jcls = %p", &jcls);
-    if(NULL != jcls){
-        jmethodID updateTexImageCallback = env->GetMethodID(jcls, "updateTexImageFromNative", "()V");
-        if(NULL != updateTexImageCallback){
-            env->CallVoidMethod(obj, updateTexImageCallback);
-        }
-    }
-
-    if(jvm->DetachCurrentThread() != JNI_OK){
-        LOGE("%s: DetachCurrentThread failed", __FUNCTION__);
-    }
-}
-
-void Controller::draw()
-{
-    eglCore->makeCurrent(previewSurface);
-    render->drawToViewWithAutofit(screenWidth, screenHeight, textureWidth, textureHeight);
-    if(!eglCore -> swapBuffers(previewSurface)){
-        LOGE("(eglCore -> swapBuffers(previewSurface) Error!");
-    }
-}
-
-void Controller::buildRenderInstance() {
-    render = new PreviewRender();
-}
-
-

android/app/src/main/cpp/controller.h

@@ -1,156 +0,0 @@
-#ifndef ANDROIDRECORDER_CONTROLLER_H
-#define ANDROIDRECORDER_CONTROLLER_H
-
-#include <jni.h>
-#include <android/native_window_jni.h>
-#include <android/native_window_jni.h>
-#include <sys/types.h>
-#include "common/message_handler.h"
-#include "egl/egl_core.h"
-#include "opengl/opengl_render.h"
-#include "opengl/preview_render.h"
-#include "common/coomon_utils.h"
-
-#define CAMERA_FACING_BACK   0
-#define CAMERA_FACING_FRONT  1
-
-enum RenderThreadMessage {
-    MSG_RENDER_FRAME = 0,
-    MSG_EGL_THREAD_CREATE,
-    MSG_EGL_CREATE_PREVIEW_SURFACE,
-    MSG_SWITCH_CAMERA,
-    MSG_START_RECORDING,
-    MSG_STOP_RECORDING,
-    MSG_EGL_DESTROY_PREVIEW_SURFACE,
-    MSG_EGL_THREAD_EXIT
-};
-
-class Controller{
-public:
-
-    Controller();
-
-    virtual ~Controller();
-
-    void prepareEGLContext(ANativeWindow *window, JavaVM *jvm, jobject obj,
-                           int screenWidth, int screenHeight, int cameraFacingId);
-
-    void notifyFrameAvaliable();
-
-    void createWindowSurface(ANativeWindow *window);
-
-    virtual bool init();
-
-    virtual void destroy();
-
-    void createPreviewSurface();
-
-    void destroyEGLContext();
-
-    void destroyPreviewSurface();
-
-    void switchCamera();
-    void switchCameraFromMessage();
-
-    void startRecording();
-
-    void stopRecording();
-
-    void renderFrame();
-
-    void draw();
-
-
-protected:
-    ANativeWindow *_window;
-    JavaVM *jvm;
-    jobject  obj;
-    int screenWidth;
-    int screenHeight;
-
-    bool isInSwitchingCamera;
-
-    int64_t  startTime;
-
-    int facingId;
-    int degress;
-    int textureWidth;
-    int textureHeight;
-
-    int cameraWidth;
-    int cameraHeight;
-
-    Handler *handler;
-    MessageQueue *queue;
-    pthread_t _threadId;
-
-    static void *threadStartCallBack(void *myself);
-
-    void processMessage();
-
-    EGLCore *eglCore;
-    EGLSurface previewSurface;
-
-    PreviewRender *render;
-
-    virtual void buildRenderInstance();
-
-    virtual void processVideoFrame(float position);
-
-    void configCamera();
-
-    void startCameraPreview();
-
-    void updateTexImage();
-
-    void releaseCamera();
-
-    bool isThreadCreateSucceed;
-    bool isEncoding;
-};
-
-class PreviewHandler:public Handler{
-
-private:
-    Controller *controller;
-
-public:
-    PreviewHandler(Controller *controller,MessageQueue *queue):Handler(queue){
-        this->controller = controller;
-    };
-
-    void handleMessage(Message *msg){
-        int what = msg->getWhat();
-        switch (what) {
-            case MSG_EGL_THREAD_CREATE:
-                controller->init();
-                break;
-            case MSG_EGL_CREATE_PREVIEW_SURFACE:
-                controller->createPreviewSurface();
-                break;
-            case MSG_START_RECORDING:
-                controller->startRecording();
-                break;
-            case MSG_STOP_RECORDING:
-                controller->stopRecording();
-                break;
-            case MSG_EGL_DESTROY_PREVIEW_SURFACE:
-                controller->destroyPreviewSurface();
-                break;
-            case MSG_EGL_THREAD_EXIT:
-                controller->destroy();
-                break;
-            case MSG_RENDER_FRAME:
-                controller->renderFrame();
-                break;
-            case MSG_SWITCH_CAMERA:
-                controller->switchCameraFromMessage();
-                break;
-        }
-    }
-
-
-};
-
-
-#endif //ANDROIDRECORDER_CONTROLLER_H

android/app/src/main/cpp/native-lib.cpp

@@ -1,10 +0,0 @@
-#include <jni.h>
-#include <string>
-
-extern "C" JNIEXPORT jstring JNICALL
-Java_com_cfmlg_mlg_MainActivity_stringFromJNI(
-        JNIEnv* env,
-        jobject /* this */) {
-    std::string hello = "口腔扫描仪";
-    return env->NewStringUTF(hello.c_str());
-}

android/app/src/main/java/com/eitchsyh/instrument/Video.java

@@ -11,8 +11,6 @@ public class Video
 {
     static
     {
-        System.loadLibrary("mlg");
-        System.loadLibrary("ffmpeg");
         System.loadLibrary("iMVR");
     }
 

lib/app_router.dart

@@ -25,5 +25,6 @@ class AppRouter extends RootStackRouter {
         AutoRoute(page: AddPatientRoute.page),
         AutoRoute(page: PhotoPreviewRoute.page),
         AutoRoute(page: VideoPreviewRoute.page),
+        AutoRoute(page: SelectHistoryRoute.page),
       ];
 }

lib/app_router.gr.dart

@@ -8,18 +8,20 @@
 // coverage:ignore-file
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i24;
+import 'dart:async' as _i25;
 
-import 'package:auto_route/auto_route.dart' as _i18;
-import 'package:eitc_erm_dental_flutter/entity/clinic_info.dart' as _i23;
+import 'package:auto_route/auto_route.dart' as _i19;
+import 'package:eitc_erm_dental_flutter/entity/clinic_info.dart' as _i24;
 import 'package:eitc_erm_dental_flutter/entity/db/local_patient_info.dart'
-    as _i21;
-import 'package:eitc_erm_dental_flutter/entity/history_item_info.dart' as _i22;
+    as _i22;
+import 'package:eitc_erm_dental_flutter/entity/history_item_info.dart' as _i23;
 import 'package:eitc_erm_dental_flutter/pages/history/history_page.dart' as _i4;
 import 'package:eitc_erm_dental_flutter/pages/history/photo_view_page.dart'
     as _i9;
+import 'package:eitc_erm_dental_flutter/pages/history/select_history_page.dart'
+    as _i10;
 import 'package:eitc_erm_dental_flutter/pages/history/video_player_page.dart'
-    as _i14;
+    as _i15;
 import 'package:eitc_erm_dental_flutter/pages/login/login_page.dart' as _i5;
 import 'package:eitc_erm_dental_flutter/pages/main/main_page.dart' as _i6;
 import 'package:eitc_erm_dental_flutter/pages/patient/add_patient_page.dart'
@@ -30,26 +32,26 @@ import 'package:eitc_erm_dental_flutter/pages/settings/delay_shot_settings_page.
     as _i2;
 import 'package:eitc_erm_dental_flutter/pages/settings/faqs_page.dart' as _i3;
 import 'package:eitc_erm_dental_flutter/pages/settings/settings_page.dart'
-    as _i10;
-import 'package:eitc_erm_dental_flutter/pages/splash/splash_page.dart' as _i11;
-import 'package:eitc_erm_dental_flutter/pages/upload/upload_page.dart' as _i12;
+    as _i11;
+import 'package:eitc_erm_dental_flutter/pages/splash/splash_page.dart' as _i12;
+import 'package:eitc_erm_dental_flutter/pages/upload/upload_page.dart' as _i13;
 import 'package:eitc_erm_dental_flutter/pages/upload/upload_select_clinic_page.dart'
-    as _i13;
+    as _i14;
 import 'package:eitc_erm_dental_flutter/pages/view/photo_preview_page.dart'
     as _i8;
 import 'package:eitc_erm_dental_flutter/pages/view/video_preview_page.dart'
-    as _i15;
-import 'package:eitc_erm_dental_flutter/pages/view/video_view_page.dart'
     as _i16;
-import 'package:eitc_erm_dental_flutter/pages/web/webview_page.dart' as _i17;
-import 'package:flutter/foundation.dart' as _i19;
-import 'package:flutter/material.dart' as _i20;
-import 'package:retrofit/dio.dart' as _i25;
+import 'package:eitc_erm_dental_flutter/pages/view/video_view_page.dart'
+    as _i17;
+import 'package:eitc_erm_dental_flutter/pages/web/webview_page.dart' as _i18;
+import 'package:flutter/foundation.dart' as _i20;
+import 'package:flutter/material.dart' as _i21;
+import 'package:retrofit/dio.dart' as _i26;
 
 /// generated route for
 /// [_i1.AddPatientPage]
-class AddPatientRoute extends _i18.PageRouteInfo<void> {
-  const AddPatientRoute({List<_i18.PageRouteInfo>? children})
+class AddPatientRoute extends _i19.PageRouteInfo<void> {
+  const AddPatientRoute({List<_i19.PageRouteInfo>? children})
       : super(
           AddPatientRoute.name,
           initialChildren: children,
@@ -57,7 +59,7 @@ class AddPatientRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'AddPatientRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       return const _i1.AddPatientPage();
@@ -67,8 +69,8 @@ class AddPatientRoute extends _i18.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i2.DelayShotSettingsPage]
-class DelayShotSettingsRoute extends _i18.PageRouteInfo<void> {
-  const DelayShotSettingsRoute({List<_i18.PageRouteInfo>? children})
+class DelayShotSettingsRoute extends _i19.PageRouteInfo<void> {
+  const DelayShotSettingsRoute({List<_i19.PageRouteInfo>? children})
       : super(
           DelayShotSettingsRoute.name,
           initialChildren: children,
@@ -76,7 +78,7 @@ class DelayShotSettingsRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'DelayShotSettingsRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       return const _i2.DelayShotSettingsPage();
@@ -86,8 +88,8 @@ class DelayShotSettingsRoute extends _i18.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i3.FaqsPage]
-class FaqsRoute extends _i18.PageRouteInfo<void> {
-  const FaqsRoute({List<_i18.PageRouteInfo>? children})
+class FaqsRoute extends _i19.PageRouteInfo<void> {
+  const FaqsRoute({List<_i19.PageRouteInfo>? children})
       : super(
           FaqsRoute.name,
           initialChildren: children,
@@ -95,7 +97,7 @@ class FaqsRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'FaqsRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       return const _i3.FaqsPage();
@@ -105,8 +107,8 @@ class FaqsRoute extends _i18.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i4.HistoryPage]
-class HistoryRoute extends _i18.PageRouteInfo<void> {
-  const HistoryRoute({List<_i18.PageRouteInfo>? children})
+class HistoryRoute extends _i19.PageRouteInfo<void> {
+  const HistoryRoute({List<_i19.PageRouteInfo>? children})
       : super(
           HistoryRoute.name,
           initialChildren: children,
@@ -114,7 +116,7 @@ class HistoryRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'HistoryRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       return const _i4.HistoryPage();
@@ -124,11 +126,11 @@ class HistoryRoute extends _i18.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i5.LoginPage]
-class LoginRoute extends _i18.PageRouteInfo<LoginRouteArgs> {
+class LoginRoute extends _i19.PageRouteInfo<LoginRouteArgs> {
   LoginRoute({
-    _i19.Key? key,
+    _i20.Key? key,
     required bool cancelable,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           LoginRoute.name,
           args: LoginRouteArgs(
@@ -140,7 +142,7 @@ class LoginRoute extends _i18.PageRouteInfo<LoginRouteArgs> {
 
   static const String name = 'LoginRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<LoginRouteArgs>();
@@ -158,7 +160,7 @@ class LoginRouteArgs {
     required this.cancelable,
   });
 
-  final _i19.Key? key;
+  final _i20.Key? key;
 
   final bool cancelable;
 
@@ -170,8 +172,8 @@ class LoginRouteArgs {
 
 /// generated route for
 /// [_i6.MainPage]
-class MainRoute extends _i18.PageRouteInfo<void> {
-  const MainRoute({List<_i18.PageRouteInfo>? children})
+class MainRoute extends _i19.PageRouteInfo<void> {
+  const MainRoute({List<_i19.PageRouteInfo>? children})
       : super(
           MainRoute.name,
           initialChildren: children,
@@ -179,7 +181,7 @@ class MainRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'MainRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       return const _i6.MainPage();
@@ -189,11 +191,11 @@ class MainRoute extends _i18.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i7.PatientListPage]
-class PatientListRoute extends _i18.PageRouteInfo<PatientListRouteArgs> {
+class PatientListRoute extends _i19.PageRouteInfo<PatientListRouteArgs> {
   PatientListRoute({
-    _i20.Key? key,
+    _i21.Key? key,
     bool selectable = true,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           PatientListRoute.name,
           args: PatientListRouteArgs(
@@ -205,7 +207,7 @@ class PatientListRoute extends _i18.PageRouteInfo<PatientListRouteArgs> {
 
   static const String name = 'PatientListRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<PatientListRouteArgs>(
@@ -224,7 +226,7 @@ class PatientListRouteArgs {
     this.selectable = true,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
   final bool selectable;
 
@@ -236,17 +238,17 @@ class PatientListRouteArgs {
 
 /// generated route for
 /// [_i8.PhotoPreviewPage]
-class PhotoPreviewRoute extends _i18.PageRouteInfo<PhotoPreviewRouteArgs> {
+class PhotoPreviewRoute extends _i19.PageRouteInfo<PhotoPreviewRouteArgs> {
   PhotoPreviewRoute({
-    _i20.Key? key,
-    required _i21.LocalPatientInfo info,
+    _i21.Key? key,
+    required _i22.LocalPatientInfo info,
     required String path,
     required String area,
     required DateTime time,
     required String mobile,
     required String deviceModel,
     required String wifi,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           PhotoPreviewRoute.name,
           args: PhotoPreviewRouteArgs(
@@ -264,7 +266,7 @@ class PhotoPreviewRoute extends _i18.PageRouteInfo<PhotoPreviewRouteArgs> {
 
   static const String name = 'PhotoPreviewRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<PhotoPreviewRouteArgs>();
@@ -294,9 +296,9 @@ class PhotoPreviewRouteArgs {
     required this.wifi,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final _i21.LocalPatientInfo info;
+  final _i22.LocalPatientInfo info;
 
   final String path;
 
@@ -318,11 +320,11 @@ class PhotoPreviewRouteArgs {
 
 /// generated route for
 /// [_i9.PhotoViewPage]
-class PhotoViewRoute extends _i18.PageRouteInfo<PhotoViewRouteArgs> {
+class PhotoViewRoute extends _i19.PageRouteInfo<PhotoViewRouteArgs> {
   PhotoViewRoute({
-    _i20.Key? key,
-    required _i22.HistoryItemInfo? info,
-    List<_i18.PageRouteInfo>? children,
+    _i21.Key? key,
+    required _i23.HistoryItemInfo? info,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           PhotoViewRoute.name,
           args: PhotoViewRouteArgs(
@@ -334,7 +336,7 @@ class PhotoViewRoute extends _i18.PageRouteInfo<PhotoViewRouteArgs> {
 
   static const String name = 'PhotoViewRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<PhotoViewRouteArgs>();
@@ -352,9 +354,9 @@ class PhotoViewRouteArgs {
     required this.info,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final _i22.HistoryItemInfo? info;
+  final _i23.HistoryItemInfo? info;
 
   @override
   String toString() {
@@ -363,9 +365,73 @@ class PhotoViewRouteArgs {
 }
 
 /// generated route for
-/// [_i10.SettingsPage]
-class SettingsRoute extends _i18.PageRouteInfo<void> {
-  const SettingsRoute({List<_i18.PageRouteInfo>? children})
+/// [_i10.SelectHistoryPage]
+class SelectHistoryRoute extends _i19.PageRouteInfo<SelectHistoryRouteArgs> {
+  SelectHistoryRoute({
+    _i21.Key? key,
+    required _i10.SelectHistoryType selectType,
+    required bool isFillterPatient,
+    bool isMultiSelect = false,
+    int maxCount = 0,
+    List<_i19.PageRouteInfo>? children,
+  }) : super(
+          SelectHistoryRoute.name,
+          args: SelectHistoryRouteArgs(
+            key: key,
+            selectType: selectType,
+            isFillterPatient: isFillterPatient,
+            isMultiSelect: isMultiSelect,
+            maxCount: maxCount,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'SelectHistoryRoute';
+
+  static _i19.PageInfo page = _i19.PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<SelectHistoryRouteArgs>();
+      return _i10.SelectHistoryPage(
+        key: args.key,
+        selectType: args.selectType,
+        isFillterPatient: args.isFillterPatient,
+        isMultiSelect: args.isMultiSelect,
+        maxCount: args.maxCount,
+      );
+    },
+  );
+}
+
+class SelectHistoryRouteArgs {
+  const SelectHistoryRouteArgs({
+    this.key,
+    required this.selectType,
+    required this.isFillterPatient,
+    this.isMultiSelect = false,
+    this.maxCount = 0,
+  });
+
+  final _i21.Key? key;
+
+  final _i10.SelectHistoryType selectType;
+
+  final bool isFillterPatient;
+
+  final bool isMultiSelect;
+
+  final int maxCount;
+
+  @override
+  String toString() {
+    return 'SelectHistoryRouteArgs{key: $key, selectType: $selectType, isFillterPatient: $isFillterPatient, isMultiSelect: $isMultiSelect, maxCount: $maxCount}';
+  }
+}
+
+/// generated route for
+/// [_i11.SettingsPage]
+class SettingsRoute extends _i19.PageRouteInfo<void> {
+  const SettingsRoute({List<_i19.PageRouteInfo>? children})
       : super(
           SettingsRoute.name,
           initialChildren: children,
@@ -373,18 +439,18 @@ class SettingsRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'SettingsRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
-      return const _i10.SettingsPage();
+      return const _i11.SettingsPage();
     },
   );
 }
 
 /// generated route for
-/// [_i11.SplashPage]
-class SplashRoute extends _i18.PageRouteInfo<void> {
-  const SplashRoute({List<_i18.PageRouteInfo>? children})
+/// [_i12.SplashPage]
+class SplashRoute extends _i19.PageRouteInfo<void> {
+  const SplashRoute({List<_i19.PageRouteInfo>? children})
       : super(
           SplashRoute.name,
           initialChildren: children,
@@ -392,23 +458,23 @@ class SplashRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'SplashRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
-      return const _i11.SplashPage();
+      return const _i12.SplashPage();
     },
   );
 }
 
 /// generated route for
-/// [_i12.UploadPage]
-class UploadRoute extends _i18.PageRouteInfo<UploadRouteArgs> {
+/// [_i13.UploadPage]
+class UploadRoute extends _i19.PageRouteInfo<UploadRouteArgs> {
   UploadRoute({
-    _i20.Key? key,
-    required List<_i22.HistoryItemInfo> uploadList,
-    required _i23.ClinicInfo clinicInfo,
+    _i21.Key? key,
+    required List<_i23.HistoryItemInfo> uploadList,
+    required _i24.ClinicInfo clinicInfo,
     required bool isFromView,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           UploadRoute.name,
           args: UploadRouteArgs(
@@ -422,11 +488,11 @@ class UploadRoute extends _i18.PageRouteInfo<UploadRouteArgs> {
 
   static const String name = 'UploadRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<UploadRouteArgs>();
-      return _i12.UploadPage(
+      return _i13.UploadPage(
         key: args.key,
         uploadList: args.uploadList,
         clinicInfo: args.clinicInfo,
@@ -444,11 +510,11 @@ class UploadRouteArgs {
     required this.isFromView,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final List<_i22.HistoryItemInfo> uploadList;
+  final List<_i23.HistoryItemInfo> uploadList;
 
-  final _i23.ClinicInfo clinicInfo;
+  final _i24.ClinicInfo clinicInfo;
 
   final bool isFromView;
 
@@ -459,14 +525,14 @@ class UploadRouteArgs {
 }
 
 /// generated route for
-/// [_i13.UploadSelectClinicPage]
+/// [_i14.UploadSelectClinicPage]
 class UploadSelectClinicRoute
-    extends _i18.PageRouteInfo<UploadSelectClinicRouteArgs> {
+    extends _i19.PageRouteInfo<UploadSelectClinicRouteArgs> {
   UploadSelectClinicRoute({
-    _i20.Key? key,
-    required List<_i22.HistoryItemInfo> uploadList,
+    _i21.Key? key,
+    required List<_i23.HistoryItemInfo> uploadList,
     required bool isFromView,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           UploadSelectClinicRoute.name,
           args: UploadSelectClinicRouteArgs(
@@ -479,11 +545,11 @@ class UploadSelectClinicRoute
 
   static const String name = 'UploadSelectClinicRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<UploadSelectClinicRouteArgs>();
-      return _i13.UploadSelectClinicPage(
+      return _i14.UploadSelectClinicPage(
         key: args.key,
         uploadList: args.uploadList,
         isFromView: args.isFromView,
@@ -499,9 +565,9 @@ class UploadSelectClinicRouteArgs {
     required this.isFromView,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final List<_i22.HistoryItemInfo> uploadList;
+  final List<_i23.HistoryItemInfo> uploadList;
 
   final bool isFromView;
 
@@ -512,12 +578,12 @@ class UploadSelectClinicRouteArgs {
 }
 
 /// generated route for
-/// [_i14.VideoPlayerPage]
-class VideoPlayerRoute extends _i18.PageRouteInfo<VideoPlayerRouteArgs> {
+/// [_i15.VideoPlayerPage]
+class VideoPlayerRoute extends _i19.PageRouteInfo<VideoPlayerRouteArgs> {
   VideoPlayerRoute({
-    _i20.Key? key,
-    required _i22.HistoryItemInfo? info,
-    List<_i18.PageRouteInfo>? children,
+    _i21.Key? key,
+    required _i23.HistoryItemInfo? info,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           VideoPlayerRoute.name,
           args: VideoPlayerRouteArgs(
@@ -529,11 +595,11 @@ class VideoPlayerRoute extends _i18.PageRouteInfo<VideoPlayerRouteArgs> {
 
   static const String name = 'VideoPlayerRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<VideoPlayerRouteArgs>();
-      return _i14.VideoPlayerPage(
+      return _i15.VideoPlayerPage(
         key: args.key,
         info: args.info,
       );
@@ -547,9 +613,9 @@ class VideoPlayerRouteArgs {
     required this.info,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final _i22.HistoryItemInfo? info;
+  final _i23.HistoryItemInfo? info;
 
   @override
   String toString() {
@@ -558,18 +624,18 @@ class VideoPlayerRouteArgs {
 }
 
 /// generated route for
-/// [_i15.VideoPreviewPage]
-class VideoPreviewRoute extends _i18.PageRouteInfo<VideoPreviewRouteArgs> {
+/// [_i16.VideoPreviewPage]
+class VideoPreviewRoute extends _i19.PageRouteInfo<VideoPreviewRouteArgs> {
   VideoPreviewRoute({
-    _i20.Key? key,
-    required _i21.LocalPatientInfo info,
+    _i21.Key? key,
+    required _i22.LocalPatientInfo info,
     required String path,
     required String area,
     required DateTime time,
     required String mobile,
     required String wifi,
     required String deviceModel,
-    List<_i18.PageRouteInfo>? children,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           VideoPreviewRoute.name,
           args: VideoPreviewRouteArgs(
@@ -587,11 +653,11 @@ class VideoPreviewRoute extends _i18.PageRouteInfo<VideoPreviewRouteArgs> {
 
   static const String name = 'VideoPreviewRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<VideoPreviewRouteArgs>();
-      return _i15.VideoPreviewPage(
+      return _i16.VideoPreviewPage(
         key: args.key,
         info: args.info,
         path: args.path,
@@ -617,9 +683,9 @@ class VideoPreviewRouteArgs {
     required this.deviceModel,
   });
 
-  final _i20.Key? key;
+  final _i21.Key? key;
 
-  final _i21.LocalPatientInfo info;
+  final _i22.LocalPatientInfo info;
 
   final String path;
 
@@ -640,9 +706,9 @@ class VideoPreviewRouteArgs {
 }
 
 /// generated route for
-/// [_i16.VideoViewPage]
-class VideoViewRoute extends _i18.PageRouteInfo<void> {
-  const VideoViewRoute({List<_i18.PageRouteInfo>? children})
+/// [_i17.VideoViewPage]
+class VideoViewRoute extends _i19.PageRouteInfo<void> {
+  const VideoViewRoute({List<_i19.PageRouteInfo>? children})
       : super(
           VideoViewRoute.name,
           initialChildren: children,
@@ -650,23 +716,23 @@ class VideoViewRoute extends _i18.PageRouteInfo<void> {
 
   static const String name = 'VideoViewRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
-      return const _i16.VideoViewPage();
+      return const _i17.VideoViewPage();
     },
   );
 }
 
 /// generated route for
-/// [_i17.WebviewPage]
-class WebviewRoute extends _i18.PageRouteInfo<WebviewRouteArgs> {
+/// [_i18.WebviewPage]
+class WebviewRoute extends _i19.PageRouteInfo<WebviewRouteArgs> {
   WebviewRoute({
-    _i19.Key? key,
+    _i20.Key? key,
     required String url,
     String? title,
-    _i24.Future<_i25.HttpResponse<String>>? htmlFuture,
-    List<_i18.PageRouteInfo>? children,
+    _i25.Future<_i26.HttpResponse<String>>? htmlFuture,
+    List<_i19.PageRouteInfo>? children,
   }) : super(
           WebviewRoute.name,
           args: WebviewRouteArgs(
@@ -680,11 +746,11 @@ class WebviewRoute extends _i18.PageRouteInfo<WebviewRouteArgs> {
 
   static const String name = 'WebviewRoute';
 
-  static _i18.PageInfo page = _i18.PageInfo(
+  static _i19.PageInfo page = _i19.PageInfo(
     name,
     builder: (data) {
       final args = data.argsAs<WebviewRouteArgs>();
-      return _i17.WebviewPage(
+      return _i18.WebviewPage(
         key: args.key,
         url: args.url,
         title: args.title,
@@ -702,13 +768,13 @@ class WebviewRouteArgs {
     this.htmlFuture,
   });
 
-  final _i19.Key? key;
+  final _i20.Key? key;
 
   final String url;
 
   final String? title;
 
-  final _i24.Future<_i25.HttpResponse<String>>? htmlFuture;
+  final _i25.Future<_i26.HttpResponse<String>>? htmlFuture;
 
   @override
   String toString() {

lib/entity/history_item_info.dart

@@ -90,4 +90,7 @@ class HistoryItemInfo {
     _isSelectMode = value;
     isSelected = false;
   }
+
+  ///文件URI,如果path为空就返回null
+  Uri? get fileUri => path.isEmpty ? null : Uri.file(path);
 }

lib/funcs.dart

@@ -26,6 +26,9 @@ import 'package:network_info_plus/network_info_plus.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:pointycastle/asymmetric/pkcs1.dart';
+import 'package:pointycastle/asymmetric/rsa.dart';
+import 'package:pointycastle/pointycastle.dart';
 
 import 'global.dart';
 
@@ -37,15 +40,20 @@ late Logger logger;
 ///初始化日志
 Future<dynamic> initLog() async {
   LogOutput? output;
-  Directory? dir = await getDownloadsDirectory();
-  if (dir != null) {
-    dir = Directory("${dir.path}/logs");
-    if (!await dir.exists()) {
-      await dir.create(recursive: true);
+  //android版有文件日志
+  if (Platform.isAndroid) {
+    Directory? dir = await getDownloadsDirectory();
+    if (dir != null) {
+      dir = Directory("${dir.path}/logs");
+      if (!await dir.exists()) {
+        await dir.create(recursive: true);
+      }
+      output = kDebugMode
+          ? MultiOutput([ConsoleOutput(), AdvancedFileOutput(path: dir.path)])
+          : ConsoleOutput();
     }
-    output = kDebugMode
-        ? MultiOutput([ConsoleOutput(), AdvancedFileOutput(path: dir.path)])
-        : ConsoleOutput();
+  } else {
+    output = ConsoleOutput();
   }
   logger = Logger(
       printer: PrettyPrinter(
@@ -532,6 +540,94 @@ String aesDecrypt(String str) {
   return _encrypter.decrypt(encrptyed, iv: _iv);
 }
 
+///合并字节数组
+Uint8List concatenateBytes(List<Uint8List> byteList) {
+  int totalLength = byteList.fold(0, (sum, bytes) => sum + bytes.length);
+  Uint8List result = Uint8List(totalLength);
+  int offset = 0;
+
+  for (var bytes in byteList) {
+    result.setRange(offset, offset + bytes.length, bytes);
+    offset += bytes.length;
+  }
+
+  return result;
+}
+
+///RSA加密,返回BASE64字符串,仅支持PKCS1编码
+///
+/// [keyBitLength] 密钥长度,应为512,1024,2048,4096中的一个,默认512
+String rsaEncrypt(String pubKey, String content, {int keyBitLength = 512}) {
+  try {
+    final cipher = PKCS1Encoding(RSAEngine())
+      ..init(
+          true,
+          PublicKeyParameter<RSAPublicKey>(
+              encrpyt.RSAKeyParser().parse(pubKey) as RSAPublicKey));
+
+    final utf8Bytes = Uint8List.fromList(utf8.encode(content));
+    final inputLen = utf8Bytes.length;
+    int offLen = 0;
+    int i = 0;
+    List<Uint8List> bops = [];
+
+    int size = (keyBitLength / 8 - 11).toInt();
+    while (inputLen - offLen > 0) {
+      final chunkSize = (inputLen - offLen > size) ? size : inputLen - offLen;
+      final cache = cipher.process(
+          Uint8List.sublistView(utf8Bytes, offLen, offLen + chunkSize));
+      bops.add(cache);
+      i++;
+      offLen = size * i;
+    }
+
+    final encryptedData = concatenateBytes(bops);
+    final base64Encoded = base64Encode(encryptedData);
+
+    return base64Encoded;
+  } catch (e) {
+    loge("RSA加密异常", error: e);
+    return "";
+  }
+}
+
+///RSA解密,输入BASE64,仅支持PKCS1编码
+///
+/// [keyBitLength] 密钥长度,应为512,1024,2048,4096中的一个,默认512
+String rsaDecrypt(String priKey, String content, {int keyBitLength = 512}) {
+  try {
+    final cipher = PKCS1Encoding(RSAEngine());
+    cipher.init(
+        false,
+        PrivateKeyParameter<RSAPrivateKey>(
+            encrpyt.RSAKeyParser().parse(priKey) as RSAPrivateKey));
+
+    final encryptedBytes = base64Decode(content);
+    final inputLen = encryptedBytes.length;
+    int offLen = 0;
+    int i = 0;
+
+    List<Uint8List> byteList = [];
+
+    int size = keyBitLength ~/ 8;
+    while (inputLen - offLen > 0) {
+      final int chunkSize =
+          (inputLen - offLen > size) ? size : inputLen - offLen;
+      final cache = cipher.process(
+          Uint8List.sublistView(encryptedBytes, offLen, offLen + chunkSize));
+      byteList.add(cache);
+      i++;
+      offLen = size * i;
+    }
+
+    final byteArray = concatenateBytes(byteList);
+    return utf8.decode(byteArray);
+  } catch (e) {
+    loge("RSA解密异常", error: e);
+    return '';
+  }
+}
+
 ///检查新版本
 ///
 /// 返回true表示有新版本,false没有新版本

lib/generated/intl/messages_en.dart

@@ -26,15 +26,17 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m2(selected) => "${selected} has been selected";
 
-  static String m3(appName) =>
+  static String m3(count) => "You can choose up to ${count}";
+
+  static String m4(appName) =>
       "Welcome to ${appName}!\n\nWe have formulated the User Agreement and Privacy Policy in accordance with relevant laws to help you understand how we collect, store and use your personal information. \n\nBased on your express authorization, we may call your device permissions, and you have the right to refuse or cancel the authorization, please refer to the \"Permission Description\" for specific permission acquisition";
 
-  static String m4(area) =>
+  static String m5(area) =>
       "Please photograph the oral ${area}, and the best distance is 1.5 cm";
 
-  static String m5(age) => "${age} years old";
+  static String m6(age) => "${age} years old";
 
-  static String m6(second) => "${second}Second";
+  static String m7(second) => "${second}Second";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -146,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "male": MessageLookupByLibrary.simpleMessage("Male"),
         "maxPatientCount": MessageLookupByLibrary.simpleMessage(
             "You\'ve already added four patients and can\'t add any more."),
+        "maxSelectCountXx": m3,
         "mobileColon": MessageLookupByLibrary.simpleMessage("Mobile:"),
         "mobileFormatError": MessageLookupByLibrary.simpleMessage(
             "Please enter a valid mobile phone number"),
@@ -176,7 +179,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "The network is not connected"),
         "open": MessageLookupByLibrary.simpleMessage("Open"),
         "patientList": MessageLookupByLibrary.simpleMessage("Patient list"),
-        "permissionDescDialogContent": m3,
+        "permissionDescDialogContent": m4,
         "permissionDescDialogTitle": MessageLookupByLibrary.simpleMessage(
             "User Agreement and Privacy Policy Reminder"),
         "permissionDescription":
@@ -196,6 +199,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Please enter your real name"),
         "pleaseInputValidIdCard": MessageLookupByLibrary.simpleMessage(
             "Please enter a valid ID number"),
+        "pleaseSelectAtLastOne":
+            MessageLookupByLibrary.simpleMessage("Please select at least one"),
         "pleaseSelectPatient":
             MessageLookupByLibrary.simpleMessage("Please select a patient"),
         "pleaseSelectRelation": MessageLookupByLibrary.simpleMessage(
@@ -245,6 +250,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
         "selectPatient":
             MessageLookupByLibrary.simpleMessage("Select the patient"),
+        "selectPhoto": MessageLookupByLibrary.simpleMessage("Select Photos"),
+        "selectPhotoAndRecord": MessageLookupByLibrary.simpleMessage(
+            "Select Photo & Video Recording"),
+        "selectRecord":
+            MessageLookupByLibrary.simpleMessage("Select Recording"),
         "selectToothAreaHint": MessageLookupByLibrary.simpleMessage(
             "Please select the tooth area"),
         "send": MessageLookupByLibrary.simpleMessage("Send"),
@@ -281,7 +291,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "syncDataWaiting": MessageLookupByLibrary.simpleMessage(
             "Data is syncing, please wait"),
         "takePhoto": MessageLookupByLibrary.simpleMessage("Take photo"),
-        "takePhotoAreaHint": m4,
+        "takePhotoAreaHint": m5,
         "takePhotoFailed":
             MessageLookupByLibrary.simpleMessage("Failed to take a photo"),
         "takePhotoSuccess": MessageLookupByLibrary.simpleMessage(
@@ -311,7 +321,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "video": MessageLookupByLibrary.simpleMessage("Video"),
         "waitingConnectDevice": MessageLookupByLibrary.simpleMessage(
             "Waiting for the device to connect"),
-        "xxAge": m5,
-        "xxSecond": m6
+        "xxAge": m6,
+        "xxSecond": m7
       };
 }

lib/generated/intl/messages_zh.dart

@@ -26,14 +26,16 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m2(selected) => "已选择${selected}";
 
-  static String m3(appName) =>
+  static String m3(count) => "最多可以选择${count}项";
+
+  static String m4(appName) =>
       "欢迎使用${appName}!\n\n我们根据相关法律制定了《用户协议》和《隐私政策》，帮助您了解我们如何收集、保存、使用您的个人信息，请您在同意之前仔细阅读并充分理解相关条款。\n\n基于您的明示授权，我们将可能调用您的设备权限，您有权拒绝或取消授权，具体权限获取情况详见《权限说明》";
 
-  static String m4(area) => "请对口腔${area}域进行拍摄，最佳拍摄距离为1.5cm";
+  static String m5(area) => "请对口腔${area}域进行拍摄，最佳拍摄距离为1.5cm";
 
-  static String m5(age) => "${age}岁";
+  static String m6(age) => "${age}岁";
 
-  static String m6(second) => "${second}秒";
+  static String m7(second) => "${second}秒";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -117,6 +119,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "male": MessageLookupByLibrary.simpleMessage("男"),
         "maxPatientCount":
             MessageLookupByLibrary.simpleMessage("您已经添加了四位咨询人，无法再添加更多咨询人了。"),
+        "maxSelectCountXx": m3,
         "mobileColon": MessageLookupByLibrary.simpleMessage("手机号:"),
         "mobileFormatError": MessageLookupByLibrary.simpleMessage("请输入正确的手机号"),
         "mobileInputHint": MessageLookupByLibrary.simpleMessage("请输入手机号"),
@@ -140,7 +143,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "notworkNotConnect": MessageLookupByLibrary.simpleMessage("网络未连接"),
         "open": MessageLookupByLibrary.simpleMessage("开启"),
         "patientList": MessageLookupByLibrary.simpleMessage("咨询人列表"),
-        "permissionDescDialogContent": m3,
+        "permissionDescDialogContent": m4,
         "permissionDescDialogTitle":
             MessageLookupByLibrary.simpleMessage("用户协议及隐私政策提示"),
         "permissionDescription": MessageLookupByLibrary.simpleMessage("权限说明"),
@@ -156,6 +159,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseInputRealName": MessageLookupByLibrary.simpleMessage("请输入真实姓名"),
         "pleaseInputValidIdCard":
             MessageLookupByLibrary.simpleMessage("请输入有效的身份证号"),
+        "pleaseSelectAtLastOne":
+            MessageLookupByLibrary.simpleMessage("请至少选择一项"),
         "pleaseSelectPatient": MessageLookupByLibrary.simpleMessage("请选择咨询人"),
         "pleaseSelectRelation":
             MessageLookupByLibrary.simpleMessage("请选择与您本人关系"),
@@ -192,6 +197,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "saveSuccess": MessageLookupByLibrary.simpleMessage("保存成功"),
         "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
         "selectPatient": MessageLookupByLibrary.simpleMessage("选择咨询人"),
+        "selectPhoto": MessageLookupByLibrary.simpleMessage("选择照片"),
+        "selectPhotoAndRecord": MessageLookupByLibrary.simpleMessage("选择照片和录像"),
+        "selectRecord": MessageLookupByLibrary.simpleMessage("选择录像"),
         "selectToothAreaHint": MessageLookupByLibrary.simpleMessage("请选择牙齿区域"),
         "send": MessageLookupByLibrary.simpleMessage("发送"),
         "serverError": MessageLookupByLibrary.simpleMessage("服务器异常"),
@@ -218,7 +226,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "switchPatient": MessageLookupByLibrary.simpleMessage("切换咨询人"),
         "syncDataWaiting": MessageLookupByLibrary.simpleMessage("正在同步数据,请稍候"),
         "takePhoto": MessageLookupByLibrary.simpleMessage("拍照"),
-        "takePhotoAreaHint": m4,
+        "takePhotoAreaHint": m5,
         "takePhotoFailed": MessageLookupByLibrary.simpleMessage("拍照失败"),
         "takePhotoSuccess": MessageLookupByLibrary.simpleMessage("拍照成功"),
         "tapAgainExit": MessageLookupByLibrary.simpleMessage("再次点击退出程序"),
@@ -243,7 +251,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "video": MessageLookupByLibrary.simpleMessage("视频"),
         "waitingConnectDevice":
             MessageLookupByLibrary.simpleMessage("正在等待设备连接"),
-        "xxAge": m5,
-        "xxSecond": m6
+        "xxAge": m6,
+        "xxSecond": m7
       };
 }

lib/generated/l10n.dart

@@ -1789,6 +1789,56 @@ class S {
       args: [],
     );
   }
+
+  /// `Select Photos`
+  String get selectPhoto {
+    return Intl.message(
+      'Select Photos',
+      name: 'selectPhoto',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Select Recording`
+  String get selectRecord {
+    return Intl.message(
+      'Select Recording',
+      name: 'selectRecord',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Select Photo & Video Recording`
+  String get selectPhotoAndRecord {
+    return Intl.message(
+      'Select Photo & Video Recording',
+      name: 'selectPhotoAndRecord',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `You can choose up to {count}`
+  String maxSelectCountXx(Object count) {
+    return Intl.message(
+      'You can choose up to $count',
+      name: 'maxSelectCountXx',
+      desc: '',
+      args: [count],
+    );
+  }
+
+  /// `Please select at least one`
+  String get pleaseSelectAtLastOne {
+    return Intl.message(
+      'Please select at least one',
+      name: 'pleaseSelectAtLastOne',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {

lib/global.dart

@@ -66,3 +66,14 @@ final MethodChannel videoChannel = const MethodChannel(_videoChannelName);
 
 ///文件channel
 final MethodChannel fileChannel = const MethodChannel(_fileChannelName);
+
+///国康RSA加密公钥
+final String gkRsaPublicKey = """
+-----BEGIN PUBLIC KEY-----
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALltnyc4QcGMQ7/ZT+xmV6x/OXdJ2k5ftatsES9XlScM
+fPgs/mANKCixDwNFOIAFvTnKUvGgxVhBXpFL8Ma/J0cCAwEAAQ==
+-----END PUBLIC KEY-----
+    """;
+
+///国康RSA加密密钥长度
+final int gkRsaKeyBitLength = 512;

lib/l10n/intl_en.arb

@@ -172,5 +172,10 @@
   "permissionDescDialogContent": "Welcome to {appName}!\n\nWe have formulated the User Agreement and Privacy Policy in accordance with relevant laws to help you understand how we collect, store and use your personal information. \n\nBased on your express authorization, we may call your device permissions, and you have the right to refuse or cancel the authorization, please refer to the \"Permission Description\" for specific permission acquisition",
   "read": "Read",
   "agreeContinue": "Agree",
-  "requestLocationHint": "Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window."
+  "requestLocationHint": "Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window.",
+  "selectPhoto": "Select Photos",
+  "selectRecord": "Select Recording",
+  "selectPhotoAndRecord": "Select Photo & Video Recording",
+  "maxSelectCountXx": "You can choose up to {count}",
+  "pleaseSelectAtLastOne": "Please select at least one"
 }

lib/l10n/intl_zh.arb

@@ -172,5 +172,10 @@
   "permissionDescDialogContent": "欢迎使用{appName}!\n\n我们根据相关法律制定了《用户协议》和《隐私政策》，帮助您了解我们如何收集、保存、使用您的个人信息，请您在同意之前仔细阅读并充分理解相关条款。\n\n基于您的明示授权，我们将可能调用您的设备权限，您有权拒绝或取消授权，具体权限获取情况详见《权限说明》",
   "read": "阅读",
   "agreeContinue": "同意并继续",
-  "requestLocationHint": "因应用配套仪器使用WiFi连接，需通过位置权限判断您是否已连接仪器WiFi，请求获取您的位置权限，请在下个弹窗中点击允许。"
+  "requestLocationHint": "因应用配套仪器使用WiFi连接，需通过位置权限判断您是否已连接仪器WiFi，请求获取您的位置权限，请在下个弹窗中点击允许。",
+  "selectPhoto": "选择照片",
+  "selectRecord": "选择录像",
+  "selectPhotoAndRecord": "选择照片和录像",
+  "maxSelectCountXx": "最多可以选择{count}项",
+  "pleaseSelectAtLastOne": "请至少选择一项"
 }

lib/pages/history/history_page.dart

@@ -6,6 +6,8 @@ import 'package:eitc_erm_dental_flutter/entity/history_item_info.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/pages/history/vm/history_view_model.dart';
 import 'package:eitc_erm_dental_flutter/pages/history/widget/history_item_view.dart';
+import 'package:eitc_erm_dental_flutter/widget/empty_widget.dart';
+import 'package:eitc_erm_dental_flutter/widget/loading_widget.dart';
 import 'package:eitc_erm_dental_flutter/widget/main_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -190,57 +192,19 @@ class _HistoryPageState extends ConsumerState<HistoryPage> {
     });
   }
 
-  Widget _getLoading() {
-    return Center(
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Icon(
-            Icons.downloading,
-            size: 35.r,
-          ),
-          SizedBox(
-            width: 10.w,
-          ),
-          Text(
-            getS().loadingHistories,
-          )
-        ],
-      ),
-    );
-  }
-
-  Widget _getEmpty() {
-    return Center(
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Icon(
-            Icons.sentiment_dissatisfied,
-            size: 35.r,
-          ),
-          SizedBox(
-            width: 10.w,
-          ),
-          Text(
-            getS().noHistories,
-          )
-        ],
-      ),
-    );
-  }
-
   Widget _getListWidget(BuildContext context) {
     return Consumer(builder: (ctx, ref, _) {
       AsyncValue<HistoryListData> value = ref.watch(historyListProvider);
       int viewType = ref.watch(historyViewTypeProvider);
       return switch (value) {
         AsyncData<HistoryListData>(value: var data) => data.isEmpty
-            ? _getEmpty()
+            ? EmptyWidget(
+                text: getS().noHistories,
+              )
             : (viewType == 0 ? _getTimeList(data) : _getTypeList(ctx, data)),
-        _ => _getLoading()
+        _ => LoadingWidget(
+            text: getS().loadingHistories,
+          )
       };
     });
   }

lib/pages/history/select_history_page.dart

@@ -0,0 +1,304 @@
+import 'dart:io';
+
+import 'package:auto_route/annotations.dart';
+import 'package:eitc_erm_dental_flutter/db_util.dart';
+import 'package:eitc_erm_dental_flutter/entity/db/local_patient_info.dart';
+import 'package:eitc_erm_dental_flutter/global.dart';
+import 'package:eitc_erm_dental_flutter/pages/history/vm/history_view_model.dart';
+import 'package:eitc_erm_dental_flutter/pages/history/widget/history_item_view.dart';
+import 'package:eitc_erm_dental_flutter/widget/empty_widget.dart';
+import 'package:eitc_erm_dental_flutter/widget/loading_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../../entity/history_item_info.dart';
+import '../../funcs.dart';
+import '../../widget/main_button.dart';
+
+///选择历史记录类型
+enum SelectHistoryType {
+  ///照片
+  photo,
+
+  ///录像
+  record,
+
+  ///所有
+  all;
+}
+
+///历史记录选择页面
+@RoutePage(name: "SelectHistoryRoute")
+class SelectHistoryPage extends ConsumerStatefulWidget {
+  ///选择类型
+  final SelectHistoryType selectType;
+
+  ///是否过滤咨询人
+  final bool isFillterPatient;
+
+  ///是否多选
+  final bool isMultiSelect;
+
+  ///多选最大数量,0表示没有限制
+  final int maxCount;
+
+  const SelectHistoryPage(
+      {super.key,
+      required this.selectType,
+      required this.isFillterPatient,
+      this.isMultiSelect = false,
+      this.maxCount = 0});
+
+  @override
+  ConsumerState createState() => _SelectHistoryPageState();
+}
+
+class _SelectHistoryPageState extends ConsumerState<SelectHistoryPage> {
+  ///咨询人信息
+  LocalPatientInfo? _patientInfo;
+
+  ///记录数量
+  int _historyCount = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _initPatientInfo();
+    _initMultiSelect();
+  }
+
+  ///初始化咨询人信息
+  void _initPatientInfo() async {
+    if (selectedPatientId < 0) {
+      _patientInfo = null;
+    }
+    _patientInfo = await DbUtil.instance.getLocalPatientById(selectedPatientId);
+  }
+
+  ///初始化多选
+  void _initMultiSelect() {
+    ProviderSubscription<AsyncValue<HistoryListData>>? listenner;
+    //需要在读取到数据后,渲染完一帧才设置选择模式,否则读取不到historySelectModeProvider
+    listenner = ref.listenManual(historyListProvider, (_, value) {
+      if (value is! AsyncData<HistoryListData>) {
+        return;
+      }
+      listenner?.close();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        ref
+            .read(historySelectModeProvider.notifier)
+            .setSelectMode(widget.isMultiSelect);
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _getAppBar(context),
+      body: SafeArea(
+          child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 16.w),
+        child: Column(
+          children: [
+            _getSelectedCount(context),
+            Expanded(child: _getListWidget(context)),
+            _getBottomButtons(context),
+            SizedBox(
+              height: 5.h,
+            )
+          ],
+        ),
+      )),
+    );
+  }
+
+  ///获取appbar
+  AppBar _getAppBar(BuildContext context) {
+    String title = switch (widget.selectType) {
+      SelectHistoryType.photo => getS().selectPhoto,
+      SelectHistoryType.record => getS().selectRecord,
+      SelectHistoryType.all => getS().selectPhotoAndRecord,
+    };
+
+    return AppBar(
+      centerTitle: true,
+      forceMaterialTransparency: true,
+      title: Text(title),
+      leading: IconButton(
+          onPressed: () {
+            Navigator.pop(context);
+          },
+          icon: Icon(
+              Platform.isIOS ? Icons.arrow_back_ios_new : Icons.arrow_back)),
+    );
+  }
+
+  ///获取已选择数量widget
+  Widget _getSelectedCount(BuildContext context) {
+    if (!widget.isMultiSelect) {
+      return SizedBox();
+    }
+    return Row(
+      children: [
+        Consumer(builder: (_, tref, __) {
+          int count = tref.watch(historySelectedCountProvider);
+          return Text(getS().hasSelectCountItem(count));
+        }),
+        SizedBox(
+          width: 6.w,
+        ),
+        const Spacer(),
+        SizedBox(
+            width: 25.w,
+            child: Consumer(builder: (_, cref, __) {
+              int count = cref.watch(historySelectedCountProvider);
+              int totalCount = 0;
+              HistoryListData? data = cref.read(historyListProvider).value;
+              if (data != null) {
+                totalCount = switch (widget.selectType) {
+                  SelectHistoryType.photo => data.photoList.length,
+                  SelectHistoryType.record => data.videoList.length,
+                  SelectHistoryType.all => data.getMergedList(false).length,
+                };
+              }
+              return Checkbox(
+                  value: totalCount > 0 && count == totalCount,
+                  shape: const CircleBorder(),
+                  onChanged: _onSelectAll);
+            })),
+        Text(getS().selectAll),
+        SizedBox(
+          width: 5.w,
+        ),
+      ],
+    );
+  }
+
+  ///获取底部按钮
+  Widget _getBottomButtons(BuildContext context) {
+    return widget.isMultiSelect
+        ? SizedBox(
+            width: double.infinity,
+            child: MainButton(
+                text: getS().confirm, onPressed: () => _onConfirm(context)),
+          )
+        : SizedBox();
+  }
+
+  Widget _getListWidget(BuildContext context) {
+    return Consumer(builder: (ctx, ref, _) {
+      AsyncValue<HistoryListData> value = ref.watch(historyListProvider);
+      return switch (value) {
+        AsyncData<HistoryListData>(value: var data) => data.isEmpty
+            ? EmptyWidget(
+                text: getS().noHistories,
+              )
+            : _getGridView(switch (widget.selectType) {
+                SelectHistoryType.photo => data.photoList,
+                SelectHistoryType.record => data.videoList,
+                SelectHistoryType.all => data.getMergedList(true)
+              }),
+        _ => LoadingWidget(
+            text: getS().loadingHistories,
+          )
+      };
+    });
+  }
+
+  ///获取GridView
+  Widget _getGridView(List<HistoryItemInfo> list,
+      {bool shinkWarp = false, bool scrollable = true}) {
+    //是否过滤咨询人
+    if (widget.isFillterPatient) {
+      if (_patientInfo == null) {
+        list = [];
+      } else {
+        list = list
+            .where((info) =>
+                info.prefixInfo != null &&
+                info.prefixInfo!.name.isNotEmpty &&
+                info.prefixInfo!.name == _patientInfo!.name)
+            .toList();
+      }
+    }
+
+    _historyCount = list.length;
+
+    return GridView.builder(
+      shrinkWrap: shinkWarp,
+      physics: scrollable
+          ? const ClampingScrollPhysics()
+          : const NeverScrollableScrollPhysics(),
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          childAspectRatio: 164.0 / 120.0,
+          mainAxisSpacing: 8.r,
+          crossAxisSpacing: 15.r),
+      itemBuilder: (ctx, index) {
+        HistoryItemInfo item = list[index];
+        return GestureDetector(
+          child: HistoryItemView(
+            index: index,
+            name: item.name,
+            path: item.path,
+            type: item.type,
+          ),
+          onTap: () => _onTap(ctx, item),
+        );
+      },
+      itemCount: list.length,
+    );
+  }
+
+  ///全选
+  void _onSelectAll(bool? isSelect) {
+    if (isSelect == null || !isSelect) {
+      ref.read(historyListProvider.notifier).selectAll(false);
+    } else {
+      if (_historyCount <= 0) {
+        return;
+      }
+      if (_historyCount > widget.maxCount) {
+        showToast(text: getS().maxSelectCountXx(widget.maxCount));
+        return;
+      }
+      ref.read(historyListProvider.notifier).selectAll(true);
+    }
+  }
+
+  ///点击
+  void _onTap(BuildContext context, HistoryItemInfo info) {
+    if(info.isSelected)
+    {
+      ref.read(historyListProvider.notifier).select(info, false);
+      return;
+    }
+    if (widget.isMultiSelect) {
+      if (widget.maxCount > 0 &&
+          ref.read(historySelectedCountProvider) >= widget.maxCount) {
+        showToast(text: getS().maxSelectCountXx(widget.maxCount));
+        return;
+      }
+      ref.read(historyListProvider.notifier).select(info, true);
+      return;
+    }
+    _onSelected(context, [info]);
+  }
+
+  ///确定
+  void _onConfirm(BuildContext context) {
+    List<HistoryItemInfo> list =
+        ref.read(historyListProvider.notifier).getSelectedItems();
+    if (list.isEmpty) {
+      showToast(text: getS().pleaseSelectAtLastOne);
+      return;
+    }
+    _onSelected(context, list);
+  }
+
+  void _onSelected(BuildContext context, List<HistoryItemInfo> list) {
+    Navigator.pop(context, list);
+  }
+}

lib/pages/history/vm/history_view_model.g.dart

@@ -186,7 +186,7 @@ final historySelectedCountProvider = AutoDisposeProvider<int>.internal(
 );
 
 typedef HistorySelectedCountRef = AutoDisposeProviderRef<int>;
-String _$historyListHash() => r'0658bd2360975795200912466323578419bdd50a';
+String _$historyListHash() => r'06fc47638ef14fffaebc2992072f4a4460aceb0f';
 
 ///历史记录列表
 ///

lib/pages/web/webview_page.dart

@@ -1,6 +1,7 @@
 import 'package:auto_route/annotations.dart';
 import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
+import 'package:eitc_erm_dental_flutter/widget/webview_progress_bar.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
@@ -34,6 +35,9 @@ class _WebviewPageState extends State<WebviewPage> {
       iframeAllowFullscreen: true,
       javaScriptEnabled: true);
 
+  final WebviewProgressBarController _progressBarController =
+      WebviewProgressBarController();
+
   @override
   void initState() {
     super.initState();
@@ -42,6 +46,7 @@ class _WebviewPageState extends State<WebviewPage> {
   @override
   void dispose() {
     super.dispose();
+    _progressBarController.dispose();
   }
 
   void _load() async {
@@ -67,35 +72,44 @@ class _WebviewPageState extends State<WebviewPage> {
       ),
       //body: SafeArea(child: WebViewWidget(controller: _controller)),
       body: SafeArea(
-        child: InAppWebView(
-          key: _webViewKey,
-          initialSettings: _settings,
-          onWebViewCreated: (controller) {
-            _webViewController = controller;
-            _load();
-          },
-          onLoadStart: (controller, url) {
-            logd("onLoadStart,url=$url");
-          },
-          onPermissionRequest: (controller, request) async {
-            return PermissionResponse(
-                resources: request.resources,
-                action: PermissionResponseAction.GRANT);
-          },
-          onLoadStop: (controller, url) async {
-            logd("onLoadStop,url=$url");
-          },
-          onReceivedError: (controller, request, error) {
-            loge("onReceivedError", error: error);
-          },
-          onProgressChanged: (controller, progress) {
-            logd("onProgressChanged,progress=$progress");
-          },
-          onConsoleMessage: (controller, consoleMessage) {
-            if (kDebugMode) {
-              logd(consoleMessage);
-            }
-          },
+        child: Stack(
+          children: [
+            InAppWebView(
+              key: _webViewKey,
+              initialSettings: _settings,
+              onWebViewCreated: (controller) {
+                _webViewController = controller;
+                _load();
+              },
+              onLoadStart: (controller, url) {
+                logd("onLoadStart,url=$url");
+              },
+              onPermissionRequest: (controller, request) async {
+                return PermissionResponse(
+                    resources: request.resources,
+                    action: PermissionResponseAction.GRANT);
+              },
+              onLoadStop: (controller, url) async {
+                logd("onLoadStop,url=$url");
+              },
+              onReceivedError: (controller, request, error) {
+                loge("onReceivedError", error: error);
+              },
+              onProgressChanged: (controller, progress) {
+                logd("onProgressChanged,progress=$progress");
+                _progressBarController.setProgress(progress);
+              },
+              onConsoleMessage: (controller, consoleMessage) {
+                if (kDebugMode) {
+                  logd(consoleMessage);
+                }
+              },
+            ),
+            Align(
+              alignment: Alignment.topLeft,
+              child: WebviewProgressBar(controller: _progressBarController),
+            )
+          ],
         ),
       ),
     );

lib/widget/empty_widget.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+///无数据Widget
+class EmptyWidget extends StatelessWidget {
+  final Widget? icon;
+  final String? text;
+
+  const EmptyWidget({super.key, this.text, this.icon});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          icon == null
+              ? Icon(
+                  Icons.sentiment_dissatisfied,
+                  size: 35.r,
+                )
+              : icon!,
+          SizedBox(
+            width: 10.w,
+          ),
+          text == null
+              ? SizedBox()
+              : Text(
+                  text!,
+                )
+        ],
+      ),
+    );
+  }
+}

lib/widget/loading_widget.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+///加载Widget
+class LoadingWidget extends StatelessWidget {
+  final Widget? icon;
+  final String? text;
+
+  const LoadingWidget({super.key, this.text, this.icon});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          icon == null
+              ? Icon(
+                  Icons.downloading,
+                  size: 35.r,
+                )
+              : icon!,
+          SizedBox(
+            width: 10.w,
+          ),
+          text == null
+              ? SizedBox()
+              : Text(
+                  text!,
+                )
+        ],
+      ),
+    );
+  }
+}

lib/widget/webview_progress_bar.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+
+///Webview进度条
+class WebviewProgressBar extends StatefulWidget {
+  final WebviewProgressBarController controller;
+  final bool autoHide;
+  final Color? backgroundColor;
+  final Color? color;
+  final Animation<Color?>? valueColor;
+  final String? semanticsLabel;
+  final String? semanticsValue;
+  final BorderRadiusGeometry borderRadius;
+
+  const WebviewProgressBar(
+      {super.key,
+      required this.controller,
+      this.autoHide = true,
+      this.backgroundColor,
+      this.color,
+      this.valueColor,
+      this.semanticsLabel,
+      this.semanticsValue,
+      this.borderRadius = BorderRadius.zero});
+
+  @override
+  State<WebviewProgressBar> createState() => _WebviewProgressBarState();
+}
+
+class _WebviewProgressBarState extends State<WebviewProgressBar> {
+  @override
+  void initState() {
+    super.initState();
+    widget.controller.progress.addListener(() {
+      setState(() {});
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    WebviewProgressBarController controller = widget.controller;
+    if (controller.progress.value >= 100 && widget.autoHide) {
+      return SizedBox();
+    }
+    return LinearProgressIndicator(
+      value: controller.progress.value / 100,
+      backgroundColor: widget.backgroundColor,
+      color: widget.color,
+      valueColor: widget.valueColor,
+      semanticsLabel: widget.semanticsLabel,
+      semanticsValue: widget.semanticsValue,
+      borderRadius: widget.borderRadius,
+    );
+  }
+}
+
+///Webview进度条控制器
+class WebviewProgressBarController {
+  ///进度
+  ValueNotifier<int>? _progress;
+
+  ///进度
+  ValueNotifier<int> get progress => _progress ??= ValueNotifier(0);
+
+  ///设置进度
+  void setProgress(int value) {
+    progress.value = value;
+  }
+
+  void dispose() {
+    _progress?.dispose();
+    _progress = null;
+  }
+}

pubspec.lock

@@ -955,7 +955,7 @@ packages:
     source: hosted
     version: "2.1.8"
   pointycastle:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: pointycastle
       sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.8+9
+version: 1.0.9+10
 
 environment:
   sdk: ^3.5.1
@@ -92,6 +92,7 @@ dependencies:
   image: ^4.2.0
 
   encrypt: ^5.0.3
+  pointycastle: ^3.9.1
 
   retrofit: ^4.4.1
   json_annotation: ^4.9.0