houxiao
2017-08-17 0250edfd9c4d453f25a2f9827698ccf87ff5afff
merge home base

git-svn-id: http://192.168.1.226/svn/proxy@1016 454eff88-639b-444f-9e54-f578c98de674
37个文件已删除
2个文件已添加
3个文件已修改
4048 ■■■■■ 已修改文件
RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_BlockPredictor.cpp 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_BlockPredictor.h 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_InterProcessJoint.h 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_RTSPServer.cpp 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_RTSPServer.h 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_SensetimeFaceFeatureEmit.h 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_SocketGainer.cpp 180 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_SocketGainer.h 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_StaticJpegSource.cpp 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_StaticJpegSource.h 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_V4L2Sink.h 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_V4L2Source.cpp 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_V4L2Source.h 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/LICENSE 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/Makefile 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/README.md 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2Access.h 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2Capture.h 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2Device.h 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2MmapDevice.h 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2Output.h 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/V4l2ReadWriteDevice.h 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/inc/logger.h.bak 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/src/V4l2Capture.cpp 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/src/V4l2Device.cpp 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp 242 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/libv4l2cpp/src/V4l2Output.cpp 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/main_raspicam_rtsp.cpp 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/include/mediastreamer2/msjava.h 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/android_mediacodec.cpp 650 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/android_mediacodec.h 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaCodec.h 235 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaCrypto.h 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaDrm.h 455 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaError.h 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaExtractor.h 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaFormat.cpp 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaFormat.h 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/NdkMediaMuxer.h 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/android/media/README.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/mediastreamer2/src/utils/msjava.c.cpp 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp
@@ -202,6 +202,10 @@
        return false;
    }
    static FILE *pFile = fopen("/data/bb.264", "wb");
    fwrite(frame->buffer, sizeof(char), frame->buffSize, pFile);
    fflush(pFile);
    ssize_t bufidx = AMediaCodec_dequeueInputBuffer(in->codec, 2000);
    LOGP(DEBUG, "input buffer bufidx=%zd, inputFrameCount=%d", bufidx, in->inputFrameCount++);
RtspFace/PL_BlockPredictor.cpp
File was deleted
RtspFace/PL_BlockPredictor.h
File was deleted
RtspFace/PL_InterProcessJoint.h
New file
@@ -0,0 +1 @@
// split pipeline into two process via network
RtspFace/PL_RTSPServer.cpp
@@ -96,9 +96,18 @@
            ReleaseFrame();
            return 0;
        }
        //static size_t f = 0;
        //static FILE *pFile = fopen("/data/bb.264", "wb");
        //fwrite(in.buffer, sizeof(char), in.buffSize, pFile);
        //if (++f > 400){
        //    fclose(pFile);
        //    exit(0);
        //}
        uint8_t* pBuffer = in.buffer;
        size_t newBufferSize = in.buffSize;
        if (in.config.payWithAux)
        {
            if (newBufferSize <= 4)
@@ -109,7 +118,7 @@
            pBuffer += 4;
            newBufferSize -= 4;
        }
        *FrameBuffer = pBuffer;
        *FrameSize = newBufferSize;
@@ -233,7 +242,7 @@
        return false;
    memcpy(in->buffer, frame->buffer, frame->buffSize);
    in->buffSize = frame->buffSize;
    if (in->encoderStub == nullptr)
        return false;
    
RtspFace/PL_RTSPServer.h
@@ -1,5 +1,5 @@
#ifndef _PL_RTSPSERVER_H_
#define _PL_PL_RTSPSERVER_H_
#define _PL_RTSPSERVER_H_
#include "PipeLine.h"
RtspFace/PL_SensetimeFaceFeatureEmit.h
New file
@@ -0,0 +1,6 @@
#ifndef _PL_SENSETIMEFACEFEATUREEMIT_H_
#define _PL_SENSETIMEFACEFEATUREEMIT_H_
#include "PipeLine.h"
#endif
RtspFace/PL_SocketGainer.cpp
File was deleted
RtspFace/PL_SocketGainer.h
File was deleted
RtspFace/PL_StaticJpegSource.cpp
File was deleted
RtspFace/PL_StaticJpegSource.h
File was deleted
RtspFace/PL_V4L2Sink.h
File was deleted
RtspFace/PL_V4L2Source.cpp
File was deleted
RtspFace/PL_V4L2Source.h
File was deleted
RtspFace/libv4l2cpp/LICENSE
File was deleted
RtspFace/libv4l2cpp/Makefile
File was deleted
RtspFace/libv4l2cpp/README.md
File was deleted
RtspFace/libv4l2cpp/inc/V4l2Access.h
File was deleted
RtspFace/libv4l2cpp/inc/V4l2Capture.h
File was deleted
RtspFace/libv4l2cpp/inc/V4l2Device.h
File was deleted
RtspFace/libv4l2cpp/inc/V4l2MmapDevice.h
File was deleted
RtspFace/libv4l2cpp/inc/V4l2Output.h
File was deleted
RtspFace/libv4l2cpp/inc/V4l2ReadWriteDevice.h
File was deleted
RtspFace/libv4l2cpp/inc/logger.h.bak
File was deleted
RtspFace/libv4l2cpp/src/V4l2Capture.cpp
File was deleted
RtspFace/libv4l2cpp/src/V4l2Device.cpp
File was deleted
RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp
File was deleted
RtspFace/libv4l2cpp/src/V4l2Output.cpp
File was deleted
RtspFace/main_raspicam_rtsp.cpp
File was deleted
RtspFace/mediastreamer2/include/mediastreamer2/msjava.h
File was deleted
RtspFace/mediastreamer2/src/android/android_mediacodec.cpp
File was deleted
RtspFace/mediastreamer2/src/android/android_mediacodec.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaCodec.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaCrypto.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaDrm.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaError.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaExtractor.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaFormat.cpp
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaFormat.h
File was deleted
RtspFace/mediastreamer2/src/android/media/NdkMediaMuxer.h
File was deleted
RtspFace/mediastreamer2/src/android/media/README.txt
File was deleted
RtspFace/mediastreamer2/src/utils/msjava.c.cpp
File was deleted