From 6331c55a780455e8fe5a039ef8781a0abafbd6ba Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 二月 2017 17:47:05 +0800
Subject: [PATCH] android argb
---
RtspFace/PL_AVFrameBGRA.h | 1 +
RtspFace/main.cpp | 2 +-
RtspFace/PL_AVFrameBGRA.cpp | 16 ++++++++--------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/RtspFace/PL_AVFrameBGRA.cpp b/RtspFace/PL_AVFrameBGRA.cpp
index addb967..8e333ce 100644
--- a/RtspFace/PL_AVFrameBGRA.cpp
+++ b/RtspFace/PL_AVFrameBGRA.cpp
@@ -160,9 +160,9 @@
in->buffSize = src_width * src_height * 4; // #todo use ret value?
}
- else if (in->config.convertTo == PL_AVFrameBGRA_Config::I420_TO_ARGB8888)
+ else if (in->config.convertTo == PL_AVFrameBGRA_Config::I420_TO_RGBA8888)
{
- libyuv::I420ToARGB(src_y, src_width,
+ libyuv::I420ToRGBA(src_y, src_width,
src_u, SUBSAMPLE(src_width, 2),
src_v, SUBSAMPLE(src_width, 2),
in->buffer, 4 * src_width,
@@ -190,12 +190,12 @@
in->lastFrame.pts = frame->pts;
//#test
- //static size_t f=0;
- //char fname[50];
- //sprintf(fname, "%u.argb", ++f);
- //FILE * pFile = fopen (fname,"wb");
- //fwrite (in->buffer , sizeof(char), in->buffSize, pFile);
- //fclose(pFile);
+ static size_t f=0;
+ char fname[50];
+ sprintf(fname, "%u.rgba", ++f);
+ FILE * pFile = fopen (fname,"wb");
+ fwrite (in->buffer , sizeof(char), in->buffSize, pFile);
+ fclose(pFile);
return true;
}
diff --git a/RtspFace/PL_AVFrameBGRA.h b/RtspFace/PL_AVFrameBGRA.h
index ad130bd..090d91f 100644
--- a/RtspFace/PL_AVFrameBGRA.h
+++ b/RtspFace/PL_AVFrameBGRA.h
@@ -9,6 +9,7 @@
{
I420_TO_BGRA8888,
I420_TO_ARGB8888,
+ I420_TO_RGBA8888,
I420_TO_ARGB4444,
I420_TO_RGB565
} convertTo;
diff --git a/RtspFace/main.cpp b/RtspFace/main.cpp
index 0ab3414..6e8260a 100644
--- a/RtspFace/main.cpp
+++ b/RtspFace/main.cpp
@@ -90,7 +90,7 @@
{
PL_AVFrameBGRA_Config config;
- config.convertTo = PL_AVFrameBGRA_Config::I420_TO_ARGB8888;
+ config.convertTo = PL_AVFrameBGRA_Config::I420_TO_RGBA8888;
PL_AVFrameBGRA* ple = (PL_AVFrameBGRA*)pipeLine.push_elem("PL_AVFrameBGRA");
bool ret = ple->init(&config);
if (!ret)
--
Gitblit v1.8.0