|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -7,7 +7,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/libhybris.git</param>
<param name="branch">master</param>
- <param name="revision"/>
+ <param name="revision">bfac4c57a2900209121387e602cf5f05e387efbb</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/camera/Android.mk
^
|
| @@ -52,9 +52,8 @@
LOCAL_C_INCLUDES := \
$(HYBRIS_PATH)/include \
bionic \
- bionic/libstdc++/include \
+ external/libcxx/include \
external/gtest/include \
- external/stlport/stlport \
external/skia/include/core \
LOCAL_SHARED_LIBRARIES := \
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/camera/camera_compatibility_layer.cpp
^
|
| @@ -50,8 +50,9 @@
#include <utils/KeyedVector.h>
#include <utils/Log.h>
#include <utils/String16.h>
-
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
#include <gui/NativeBufferAlloc.h>
+#endif
#include <cstring>
@@ -140,6 +141,12 @@
(void) data;
}
+void CameraControl::postRecordingFrameHandleTimestamp(nsecs_t /*timestamp*/, native_handle_t* /*handle*/)
+{
+ REPORT_FUNCTION();
+}
+
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
namespace android
{
NativeBufferAlloc::NativeBufferAlloc() {
@@ -165,6 +172,7 @@
return graphicBuffer;
}
}
+#endif
int android_camera_get_number_of_devices()
{
@@ -220,7 +228,9 @@
android::sp<CameraControl> cc = new CameraControl();
cc->listener = listener;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=3 || ANDROID_VERSION_MAJOR==5 || ANDROID_VERSION_MAJOR>=6
+#if ANDROID_VERSION_MAJOR>=7
+ cc->camera = android::Camera::connect(camera_id, android::String16("hybris"), android::Camera::USE_CALLING_UID, android::Camera::USE_CALLING_PID);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=3 || ANDROID_VERSION_MAJOR>=5
cc->camera = android::Camera::connect(camera_id, android::String16("hybris"), android::Camera::USE_CALLING_UID);
#else
cc->camera = android::Camera::connect(camera_id);
@@ -315,10 +325,13 @@
assert(control);
android::Mutex::Autolock al(control->guard);
- android::String8 raw_modes;
- raw_modes = android::String8(
+ const char* raw_modes_cstr =
control->camera_parameters.get(
- android::CameraParameters::KEY_SUPPORTED_FLASH_MODES));
+ android::CameraParameters::KEY_SUPPORTED_FLASH_MODES);
+ if (!raw_modes_cstr)
+ return;
+
+ android::String8 raw_modes = android::String8(raw_modes_cstr);
const char delimiter[2] = ",";
char *token;
@@ -685,9 +698,11 @@
static const bool allow_synchronous_mode = false;
static const bool is_controlled_by_app = true;
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
android::sp<android::NativeBufferAlloc> native_alloc(
new android::NativeBufferAlloc()
);
+#endif
#if ANDROID_VERSION_MAJOR>=5
android::sp<android::IGraphicBufferProducer> producer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/camera/direct_camera_test.cpp
^
|
| @@ -675,6 +675,7 @@
while (1) {
usleep(50);
+ preview_texture_needs_update_cb(0);
}
stop_video_recording(recorder);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/input/Android.mk
^
|
| @@ -62,9 +62,8 @@
LOCAL_C_INCLUDES := \
$(HYBRIS_PATH)/include \
bionic \
- bionic/libstdc++/include \
+ external/libcxx/include \
external/gtest/include \
- external/stlport/stlport \
external/skia/include/core
LOCAL_SHARED_LIBRARIES := \
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/input/input_compatibility_layer.cpp
^
|
| @@ -67,13 +67,13 @@
ct,
SkAlphaType::kPremul_SkAlphaType),
0);
-#elif ANDROID_VERSION_MAJOR==6
-bitmap.setInfo(
- SkImageInfo::Make(bitmap_width,
- bitmap_height,
- kRGBA_8888_SkColorType,
- SkAlphaType::kPremul_SkAlphaType),
- 0);
+#elif ANDROID_VERSION_MAJOR>=6
+ bitmap.setInfo(
+ SkImageInfo::Make(bitmap_width,
+ bitmap_height,
+ kRGBA_8888_SkColorType,
+ SkAlphaType::kPremul_SkAlphaType),
+ 0);
#endif
bitmap.allocPixels();
@@ -107,6 +107,17 @@
outResources->spotAnchor = spotAnchorIcon.copy();
}
+#if ANDROID_VERSION_MAJOR >= 7
+ void loadPointerIcon(android::SpriteIcon*)
+ {
+ }
+
+ void loadAdditionalMouseResources(std::map<int32_t, android::SpriteIcon>* /*coutResources*/,
+ std::map<int32_t, android::PointerAnimation>* /*outAnimationResources*/) {}
+ int32_t getDefaultPointerIconId() { return 0; }
+ int32_t getCustomPointerIconId() { return 0; }
+#endif
+
android::SpriteIcon spotHoverIcon;
android::SpriteIcon spotTouchIcon;
android::SpriteIcon spotAnchorIcon;
@@ -365,14 +376,24 @@
void android_input_stack_start()
{
+#if ANDROID_VERSION_MAJOR >= 7
+ global_state->input_reader_thread->run("input");
+ global_state->looper_thread->run("loop");
+#else
global_state->input_reader_thread->run();
global_state->looper_thread->run();
+#endif
}
void android_input_stack_start_waiting_for_flag(bool* flag)
{
+#if ANDROID_VERSION_MAJOR >= 7
+ global_state->input_reader_thread->run("input");
+ global_state->looper_thread->run("loop");
+#else
global_state->input_reader_thread->run();
global_state->looper_thread->run();
+#endif
while (!*flag) {
global_state->wait_condition.waitRelative(
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/Android.mk
^
|
| @@ -9,11 +9,16 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../Android.common.mk
+ifeq ($(CAMERA_SERVICE_WANT_UBUNTU_HEADERS),1)
+ LOCAL_CPPFLAGS += -DWANT_UBUNTU_CAMERA_HEADERS
+endif
+
LOCAL_SRC_FILES := \
camera_service.cpp
LOCAL_SHARED_LIBRARIES := \
libcameraservice \
+ libcamera_client \
libmedialogservice \
libcutils \
libmedia \
@@ -120,6 +125,7 @@
frameworks/av/media/libstagefright/include \
frameworks/av/include \
frameworks/native/include \
+ frameworks/native/include/media/hardware \
system/media/audio_utils/include \
frameworks/av/services/camera/libcameraservice
@@ -162,9 +168,8 @@
LOCAL_C_INCLUDES := \
$(HYBRIS_PATH)/include \
bionic \
- bionic/libstdc++/include \
+ external/libcxx/include \
external/gtest/include \
- external/stlport/stlport \
external/skia/include/core \
frameworks/base/include
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/camera_service.cpp
^
|
| @@ -23,7 +23,10 @@
#include "media_recorder_factory.h"
#include "media_recorder.h"
+#if ANDROID_VERSION_MAJOR==5 && WANT_UBUNTU_CAMERA_HEADERS
#include <media/camera_record_service.h>
+#endif
+
#include <CameraService.h>
#include <signal.h>
@@ -45,7 +48,9 @@
// for creating a new IMediaRecorder (MediaRecorder) instance over Binder
MediaRecorderFactory::instantiate();
// Enable audio recording for camera recording
+#if ANDROID_VERSION_MAJOR==5 && WANT_UBUNTU_CAMERA_HEADERS
CameraRecordService::instantiate();
+#endif
CameraService::instantiate();
ProcessState::self()->startThreadPool();
IPCThreadState::self()->joinThreadPool();
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/decoding_service.cpp
^
|
| @@ -38,7 +38,9 @@
#include <gui/IGraphicBufferProducer.h>
#include <gui/IGraphicBufferConsumer.h>
#include <gui/Surface.h>
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
#include <gui/NativeBufferAlloc.h>
+#endif
namespace android {
@@ -290,7 +292,9 @@
buffer_queue = new BufferQueue(NULL);
ALOGD("buffer_queue: %p", (void*)buffer_queue.get());
#endif
-#if ANDROID_VERSION_MAJOR>=5
+#if ANDROID_VERSION_MAJOR>=7
+ producer->setMaxDequeuedBufferCount(5);
+#elif ANDROID_VERSION_MAJOR>=5
producer->setBufferCount(5);
#else
buffer_queue->setBufferCount(5);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_codec_source_layer.cpp
^
|
| @@ -351,11 +351,16 @@
bool media_codec_source_request_idr_frame(MediaCodecSourceWrapper *source)
{
+#if ANDROID_VERSION_MAJOR < 7
MediaCodecSourcePrivate *d = MediaCodecSourcePrivate::toPrivate(source);
if (!d || !d->codec.get())
return false;
android::status_t err = d->codec->requestIDRFrame();
+#else
+ // requestIDRFrame is done in start
+ android::status_t err = android::OK;
+#endif
if (err != android::OK)
return false;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_compatibility_layer.cpp
^
|
| @@ -44,10 +44,13 @@
#include <utils/Log.h>
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
#include <gui/NativeBufferAlloc.h>
+#endif
#define REPORT_FUNCTION() ALOGV("%s \n", __PRETTY_FUNCTION__)
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
namespace android
{
NativeBufferAlloc::NativeBufferAlloc() {
@@ -73,6 +76,8 @@
return graphicBuffer;
}
}
+#endif
+
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
struct FrameAvailableListener : public android::SurfaceTexture::FrameAvailableListener
#else
@@ -254,8 +259,10 @@
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
surfaceTexture->getBufferQueue()->setBufferCount(5);
-#else
+#elif ANDROID_VERSION_MAJOR<7
bq->setBufferCount(5);
+#else
+ bq->setMaxDequeuedBufferCount(5);
#endif
texture = surfaceTexture;
texture->setFrameAvailableListener(frame_listener);
@@ -488,15 +495,16 @@
return BAD_VALUE;
}
- android::sp<android::NativeBufferAlloc> native_alloc(
- new android::NativeBufferAlloc()
- );
-
#if ANDROID_VERSION_MAJOR>=5
android::sp<IGraphicBufferProducer> producer;
android::sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
#else
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+ android::sp<android::NativeBufferAlloc> native_alloc(
+ new android::NativeBufferAlloc()
+ );
+#endif
android::sp<android::BufferQueue> buffer_queue(
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
new android::BufferQueue(false, NULL, native_alloc)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_recorder.cpp
^
|
| @@ -24,16 +24,23 @@
#include "media_recorder_factory.h"
#include <utils/Log.h>
+#if ANDROID_VERSION_MAJOR >= 7
+#include <camera/android/hardware/ICamera.h>
+#endif
#include <binder/IServiceManager.h>
#include <utils/String8.h>
#include <media/IMediaPlayerService.h>
#include <media/IMediaRecorder.h>
#include <media/mediaplayer.h> // for MEDIA_ERROR_SERVER_DIED
#include <gui/IGraphicBufferProducer.h>
+namespace a = android;
+namespace ah = android::hardware;
-namespace android {
-
-status_t MediaRecorder::setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy)
+#if ANDROID_VERSION_MAJOR >= 7
+a::status_t a::MediaRecorder::setCamera(const sp<ah::ICamera>& camera, const sp<ICameraRecordingProxy>& proxy)
+#else
+a::status_t a::MediaRecorder::setCamera(const sp<a::ICamera>& camera, const sp<ICameraRecordingProxy>& proxy)
+#endif
{
ALOGV("setCamera(%p,%p)", camera.get(), proxy.get());
if (mMediaRecorder == NULL) {
@@ -54,7 +61,7 @@
return ret;
}
-status_t MediaRecorder::setPreviewSurface(const sp<IGraphicBufferProducer>& surface)
+a::status_t a::MediaRecorder::setPreviewSurface(const sp<IGraphicBufferProducer>& surface)
{
ALOGV("setPreviewSurface(%p)", surface.get());
if (mMediaRecorder == NULL) {
@@ -79,7 +86,7 @@
return ret;
}
-status_t MediaRecorder::init()
+a::status_t a::MediaRecorder::init()
{
ALOGV("init");
if (mMediaRecorder == NULL) {
@@ -109,7 +116,7 @@
return ret;
}
-status_t MediaRecorder::setVideoSource(int vs)
+a::status_t a::MediaRecorder::setVideoSource(int vs)
{
ALOGV("setVideoSource(%d)", vs);
if (mMediaRecorder == NULL) {
@@ -144,7 +151,7 @@
return ret;
}
-status_t MediaRecorder::setAudioSource(int as)
+a::status_t a::MediaRecorder::setAudioSource(int as)
{
ALOGV("setAudioSource(%d)", as);
if (mMediaRecorder == NULL) {
@@ -177,7 +184,7 @@
return ret;
}
-status_t MediaRecorder::setOutputFormat(int of)
+a::status_t a::MediaRecorder::setOutputFormat(int of)
{
ALOGV("setOutputFormat(%d)", of);
if (mMediaRecorder == NULL) {
@@ -203,7 +210,7 @@
return ret;
}
-status_t MediaRecorder::setVideoEncoder(int ve)
+a::status_t a::MediaRecorder::setVideoEncoder(int ve)
{
ALOGV("setVideoEncoder(%d)", ve);
if (mMediaRecorder == NULL) {
@@ -233,7 +240,7 @@
return ret;
}
-status_t MediaRecorder::setAudioEncoder(int ae)
+a::status_t a::MediaRecorder::setAudioEncoder(int ae)
{
ALOGV("setAudioEncoder(%d)", ae);
if (mMediaRecorder == NULL) {
@@ -263,7 +270,7 @@
return ret;
}
#if ANDROID_VERSION_MAJOR<=5
-status_t MediaRecorder::setOutputFile(const char* path)
+a::status_t a::MediaRecorder::setOutputFile(const char* path)
{
ALOGV("setOutputFile(%s)", path);
if (mMediaRecorder == NULL) {
@@ -290,7 +297,7 @@
}
#endif
-status_t MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length)
+a::status_t a::MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length)
{
ALOGV("setOutputFile(%d, %lld, %lld)", fd, offset, length);
if (mMediaRecorder == NULL) {
@@ -327,7 +334,7 @@
return ret;
}
-status_t MediaRecorder::setVideoSize(int width, int height)
+a::status_t a::MediaRecorder::setVideoSize(int width, int height)
{
ALOGV("setVideoSize(%d, %d)", width, height);
if (mMediaRecorder == NULL) {
@@ -356,7 +363,7 @@
// Query a SurfaceMediaSurface through the Mediaserver, over the
// binder interface. This is used by the Filter Framework (MediaEncoder)
// to get an <IGraphicBufferProducer> object to hook up to ANativeWindow.
-sp<IGraphicBufferProducer> MediaRecorder::
+a::sp<a::IGraphicBufferProducer> a::MediaRecorder::
querySurfaceMediaSourceFromMediaServer()
{
Mutex::Autolock _l(mLock);
@@ -368,7 +375,7 @@
return mSurfaceMediaSource;
}
-status_t MediaRecorder::setVideoFrameRate(int frames_per_second)
+a::status_t a::MediaRecorder::setVideoFrameRate(int frames_per_second)
{
ALOGV("setVideoFrameRate(%d)", frames_per_second);
if (mMediaRecorder == NULL) {
@@ -393,7 +400,7 @@
return ret;
}
-status_t MediaRecorder::setParameters(const String8& params) {
+a::status_t a::MediaRecorder::setParameters(const String8& params) {
ALOGV("setParameters(%s)", params.string());
if (mMediaRecorder == NULL) {
ALOGE("media recorder is not initialized yet");
@@ -420,7 +427,7 @@
return ret;
}
-status_t MediaRecorder::prepare()
+a::status_t a::MediaRecorder::prepare()
{
ALOGV("prepare");
if (mMediaRecorder == NULL) {
@@ -459,7 +466,7 @@
return ret;
}
-status_t MediaRecorder::getMaxAmplitude(int* max)
+a::status_t a::MediaRecorder::getMaxAmplitude(int* max)
{
ALOGV("getMaxAmplitude");
if (mMediaRecorder == NULL) {
@@ -480,7 +487,7 @@
return ret;
}
-status_t MediaRecorder::start()
+a::status_t a::MediaRecorder::start()
{
ALOGV("start");
if (mMediaRecorder == NULL) {
@@ -502,7 +509,7 @@
return ret;
}
-status_t MediaRecorder::stop()
+a::status_t a::MediaRecorder::stop()
{
ALOGV("stop");
if (mMediaRecorder == NULL) {
@@ -530,7 +537,7 @@
}
// Reset should be OK in any state
-status_t MediaRecorder::reset()
+a::status_t a::MediaRecorder::reset()
{
ALOGV("reset");
if (mMediaRecorder == NULL) {
@@ -566,7 +573,7 @@
return ret;
}
-status_t MediaRecorder::close()
+a::status_t a::MediaRecorder::close()
{
ALOGV("close");
if (!(mCurrentState & MEDIA_RECORDER_INITIALIZED)) {
@@ -584,7 +591,7 @@
return ret;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_recorder.h
^
|
| @@ -34,7 +34,13 @@
class Surface;
class IMediaRecorder;
class IMediaRecorderFactory;
+#if ANDROID_VERSION_MAJOR >= 7
+namespace hardware {
class ICamera;
+}
+#else
+class ICamera;
+#endif
class ICameraRecordingProxy;
class IGraphicBufferProducer;
class Surface;
@@ -214,7 +220,11 @@
void died();
status_t initCheck();
+#if ANDROID_VERSION_MAJOR>=7
+ status_t setCamera(const sp<hardware::ICamera>& camera, const sp<ICameraRecordingProxy>& proxy);
+#else
status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy);
+#endif
status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface);
status_t setVideoSource(int vs);
status_t setAudioSource(int as);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_recorder_client.cpp
^
|
| @@ -52,9 +52,13 @@
REPORT_FUNCTION();
release();
}
-
+#if ANDROID_VERSION_MAJOR >= 7
+status_t MediaRecorderClient::setCamera(const sp<android::hardware::ICamera>& camera,
+ const sp<ICameraRecordingProxy>& proxy)
+#else
status_t MediaRecorderClient::setCamera(const sp<android::ICamera>& camera,
const sp<ICameraRecordingProxy>& proxy)
+#endif
{
REPORT_FUNCTION();
Mutex::Autolock lock(recorder_lock);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_recorder_client.h
^
|
| @@ -32,6 +32,13 @@
class Mutex;
class BpMediaRecorderObserver;
+#if ANDROID_VERSION_MAJOR >= 7
+namespace hardware {
+class ICamera;
+}
+#else
+class ICamera;
+#endif
/*!
* \brief The MediaRecorderClient struct wraps the service side of the MediaRecorder class
*/
@@ -41,8 +48,13 @@
MediaRecorderClient();
virtual ~MediaRecorderClient();
+#if ANDROID_VERSION_MAJOR>=7
+ virtual status_t setCamera(const sp<android::hardware::ICamera>& camera,
+ const sp<ICameraRecordingProxy>& proxy);
+#else
virtual status_t setCamera(const sp<ICamera>& camera,
const sp<ICameraRecordingProxy>& proxy);
+#endif
virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface);
virtual status_t setVideoSource(int vs);
virtual status_t setAudioSource(int as);
@@ -64,10 +76,10 @@
virtual status_t getMaxAmplitude(int* max);
virtual status_t start();
virtual status_t stop();
-#ifdef BOARD_HAS_MEDIA_RECORDER_PAUSE
+#if defined(BOARD_HAS_MEDIA_RECORDER_PAUSE) || ANDROID_VERSION_MAJOR>=7
virtual status_t pause();
#endif
-#ifdef BOARD_HAS_MEDIA_RECORDER_RESUME
+#if defined(BOARD_HAS_MEDIA_RECORDER_RESUME) || ANDROID_VERSION_MAJOR>=7
virtual status_t resume();
#endif
virtual status_t reset();
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/media/media_recorder_layer.cpp
^
|
| @@ -26,6 +26,9 @@
#include <hybris/internal/camera_control.h>
#include <hybris/media/media_recorder_layer.h>
+#if ANDROID_MAJOR_VERSION >= 7
+#include "camera/android/hardware/ICamera.h"
+#endif
#include <utils/KeyedVector.h>
#include <utils/Log.h>
@@ -230,7 +233,6 @@
}
mr->init();
-
return mr->setCamera(control->camera->remote(), control->camera->getRecordingProxy());
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/compat/surface_flinger/direct_sf_test.cpp
^
|
| @@ -21,6 +21,7 @@
#include <cstdio>
#include <unistd.h>
+#include <stdlib.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/common/hooks.c
^
|
| @@ -2468,6 +2468,66 @@
return getwc(_get_actual_fp(stream));
}
+static size_t _hybris_hook___fbufsize(FILE *stream)
+{
+ TRACE_HOOK("__fbufsize");
+ return __fbufsize(_get_actual_fp(stream));
+}
+
+static size_t _hybris_hook___fpending(FILE *stream)
+{
+ TRACE_HOOK("__fpending");
+ return __fpending(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___flbf(FILE *stream)
+{
+ TRACE_HOOK("__flbf");
+ return __flbf(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___freadable(FILE *stream)
+{
+ TRACE_HOOK("__freadable");
+ return __freadable(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___fwritable(FILE *stream)
+{
+ TRACE_HOOK("__fwritable");
+ return __fwritable(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___freading(FILE *stream)
+{
+ TRACE_HOOK("__freading");
+ return __freading(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___fwriting(FILE *stream)
+{
+ TRACE_HOOK("__fwriting");
+ return __fwriting(_get_actual_fp(stream));
+}
+
+static int _hybris_hook___fsetlocking(FILE *stream, int type)
+{
+ TRACE_HOOK("__fsetlocking");
+ return __fsetlocking(_get_actual_fp(stream), type);
+}
+
+static void _hybris_hook__flushlbf(void)
+{
+ TRACE_HOOK("_flushlbf");
+ _flushlbf();
+}
+
+static void _hybris_hook___fpurge(FILE *stream)
+{
+ TRACE_HOOK("__fpurge");
+ __fpurge(_get_actual_fp(stream));
+}
+
static void *_hybris_hook_dlopen(const char *filename, int flag)
{
TRACE("filename %s flag %i", filename, flag);
@@ -2902,6 +2962,17 @@
HOOK_DIRECT_NO_DEBUG(__cxa_finalize),
/* sys/prctl.h */
HOOK_INDIRECT(prctl),
+ /* stdio_ext.h */
+ HOOK_INDIRECT(__fbufsize),
+ HOOK_INDIRECT(__fpending),
+ HOOK_INDIRECT(__flbf),
+ HOOK_INDIRECT(__freadable),
+ HOOK_INDIRECT(__fwritable),
+ HOOK_INDIRECT(__freading),
+ HOOK_INDIRECT(__fwriting),
+ HOOK_INDIRECT(__fsetlocking),
+ HOOK_INDIRECT(_flushlbf),
+ HOOK_INDIRECT(__fpurge),
};
static struct _hook hooks_mm[] = {
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/configure.ac
^
|
| @@ -72,6 +72,12 @@
[mesa="no"])
AM_CONDITIONAL( [WANT_MESA], [test x"$mesa" = x"yes"])
+AC_ARG_ENABLE(ubuntu-camera-headers,
+ [ --enable-ubuntu-camera-headers Enable Ubuntu camera headers (default=disabled)],
+ [ubuntu-camera-headers=$enableval],
+ [ubuntu-camera-headers="no"])
+AM_CONDITIONAL( [WANT_UBUNTU_CAMERA_HEADERS], [test x"$ubuntu-camera-headers" = x"yes"])
+
AC_ARG_ENABLE(wayland,
[ --enable-wayland Enable wayland support (default=disabled)],
[wayland=$enableval
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
^
|
| @@ -36,6 +36,7 @@
#include <unistd.h>
#include <assert.h>
#include <stdlib.h>
+#include <dlfcn.h>
extern "C" {
#include <eglplatformcommon.h>
};
@@ -61,6 +62,13 @@
static EGLBoolean (*_eglDestroySyncKHR)(EGLDisplay dpy, EGLSyncKHR sync) = NULL;
static EGLint (*_eglClientWaitSyncKHR)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) = NULL;
+/* The following function is implemented in libhybris's libEGL.so.
+ * However, eglplatform_wayland.so is not linking to libEGL directly,
+ * causing undefined symbol errors during loading, if libEGL was not
+ * already loaded by some other dependencies. Therefore, we should try
+ * to load libEGL at runtime here and resolve this function dynamically */
+typedef struct _EGLDisplay *(*PFNHYBRISEGLDISPLAYGETMAPPINGPROC)(EGLDisplay dpy);
+
struct WaylandDisplay {
_EGLDisplay base;
@@ -202,6 +210,36 @@
return ((WaylandNativeWindow *) eglwin->nativewindow)->postBuffer((ANativeWindowBuffer *) buffer);
}
+/**
+ * Loads libhybris's libEGL at runtime to call hybris_egl_display_get_mapping()
+ */
+static struct _EGLDisplay *_hybris_egl_display_get_mapping(EGLDisplay dpy)
+{
+ static void *libEGL_handle = NULL;
+ static PFNHYBRISEGLDISPLAYGETMAPPINGPROC hybris_egl_display_get_mapping_fn = NULL;
+
+ if (!libEGL_handle) {
+ dlerror(); // cleanup error buffer
+ libEGL_handle = dlopen("libEGL.so.1", RTLD_NOW | RTLD_GLOBAL);
+ if (!libEGL_handle) {
+ HYBRIS_ERROR("ERROR: Failed to dlopen libEGL! %s", dlerror());
+ abort();
+ }
+ }
+
+ if (!hybris_egl_display_get_mapping_fn) {
+ dlerror(); // cleanup error buffer
+ hybris_egl_display_get_mapping_fn = (PFNHYBRISEGLDISPLAYGETMAPPINGPROC)dlsym(
+ libEGL_handle, "hybris_egl_display_get_mapping");
+ if (!hybris_egl_display_get_mapping_fn) {
+ HYBRIS_ERROR("ERROR: Cannot resolve 'hybris_egl_display_get_mapping' in libEGL! %s", dlerror());
+ abort();
+ }
+ }
+
+ return hybris_egl_display_get_mapping_fn(dpy);
+}
+
extern "C" wl_buffer *waylandws_createWlBuffer(EGLDisplay dpy, EGLImageKHR image)
{
egl_image *img = reinterpret_cast<egl_image *>(image);
@@ -211,7 +249,7 @@
return NULL;
}
if (img->target == EGL_WAYLAND_BUFFER_WL) {
- WaylandDisplay *wdpy = (WaylandDisplay *)hybris_egl_display_get_mapping(dpy);
+ WaylandDisplay *wdpy = (WaylandDisplay *)_hybris_egl_display_get_mapping(dpy);
server_wlegl_buffer *buf = server_wlegl_buffer_from((wl_resource *)img->egl_buffer);
WaylandNativeWindowBuffer wnb(buf->buf);
// The buffer will be managed by the app, so pass NULL as the queue so that
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/egl/ws.c
^
|
| @@ -20,6 +20,7 @@
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
+#include <sys/auxv.h>
static struct ws_module *ws = NULL;
@@ -40,7 +41,14 @@
if (egl_platform == NULL)
egl_platform = DEFAULT_EGL_PLATFORM;
- snprintf(ws_name, 2048, PKGLIBDIR "eglplatform_%s.so", egl_platform);
+ const char *eglplatform_dir = PKGLIBDIR;
+ const char *user_eglplatform_dir = getauxval(AT_SECURE)
+ ? NULL
+ : getenv("HYBRIS_EGLPLATFORM_DIR");
+ if (user_eglplatform_dir)
+ eglplatform_dir = user_eglplatform_dir;
+
+ snprintf(ws_name, 2048, "%s/eglplatform_%s.so", eglplatform_dir, egl_platform);
void *wsmod = (void *) dlopen(ws_name, RTLD_LAZY);
if (wsmod==NULL)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/include/hybris/camera/camera_compatibility_layer_configuration_translator.h
^
|
| @@ -28,6 +28,8 @@
extern "C" {
#endif
+#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
+
static const char* effect_modes[] =
{
android::CameraParameters::EFFECT_NONE,
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.33.tar.bz2/libhybris/hybris/include/hybris/internal/camera_control.h
^
|
| @@ -19,6 +19,9 @@
#include <camera/Camera.h>
#include <camera/CameraParameters.h>
+#if ANDROID_VERSION_MAJOR>=7
+#include <camera/android/hardware/ICamera.h>
+#endif
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
#include <gui/SurfaceTexture.h>
#else
@@ -69,6 +72,9 @@
nsecs_t timestamp,
int32_t msg_type,
const android::sp<android::IMemory>& data);
+#if ANDROID_VERSION_MAJOR >= 7
+ void postRecordingFrameHandleTimestamp(nsecs_t timestamp, native_handle_t* handle);
+#endif
};
|
