Code: Select all
libmmbd/src/aacs.cpp: In function 'void aacs_set_fopen(AACS*, void*, void*)':
libmmbd/src/aacs.cpp:300:60: error: 'bd_disc_structure_pointer' was not declared in this scope
BD_DISC bd_disc_structure = *reinterpret_cast<BD_DISC*>(bd_disc_structure_pointer); // Copy the BD_DISC structure
^
Makefile:84: recipe for target 'out/libmmbd.so.0.full' failed
make: *** [out/libmmbd.so.0.full] Error 1
Code: Select all
AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *bd_disc_structure_pointer, void* p)Code: Select all
patch -p1 < patch_file
Code: Select all
--- a/libmmbd/src/aacs.cpp
+++ b/libmmbd/src/aacs.cpp
@@ -23,6 +23,109 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <string>
+
+typedef struct bd_mutex_s BD_MUTEX;
+struct bd_mutex_s {
+ void *impl;
+};
+
+
+typedef void (*fptr_void)(...);
+typedef int (*fptr_int)(...);
+typedef int32_t (*fptr_int32)(...);
+typedef void* (*fptr_p_void)(...);
+
+typedef struct bd_aacs BD_AACS;
+
+struct bd_aacs {
+ void *h_libaacs; /* library handle from dlopen */
+ void *aacs; /* aacs handle from aacs_open() */
+
+ const uint8_t *disc_id;
+ uint32_t mkbv;
+
+ /* function pointers */
+ fptr_int decrypt_unit;
+ fptr_int decrypt_bus;
+
+ int impl_id;
+};
+
+typedef struct bd_bdplus BD_BDPLUS;
+
+struct bd_bdplus {
+ void *h_libbdplus; /* library handle from dlopen */
+
+ void *bdplus; /* bdplus handle from bdplus_open() */
+
+ /* functions */
+ fptr_int32 event;
+ fptr_p_void m2ts;
+ fptr_int32 m2ts_close;
+ fptr_int32 seek;
+ fptr_int32 fixup;
+
+ /* old API */
+ fptr_p_void title;
+
+ int impl_id;
+};
+
+typedef struct bd_dec BD_DEC;
+struct bd_dec {
+ int use_menus;
+ BD_AACS *aacs;
+ BD_BDPLUS *bdplus;
+};
+
+
+typedef struct bd_file_s BD_FILE_H;
+struct bd_file_s
+{
+ void* internal;
+ void (*close) (BD_FILE_H *file);
+ int64_t (*seek) (BD_FILE_H *file, int64_t offset, int32_t origin);
+ int64_t (*tell) (BD_FILE_H *file);
+ int (*eof) (BD_FILE_H *file);
+ int64_t (*read) (BD_FILE_H *file, uint8_t *buf, int64_t size);
+ int64_t (*write) (BD_FILE_H *file, const uint8_t *buf, int64_t size);
+};
+
+typedef struct
+{
+ char d_name[256];
+} BD_DIRENT;
+
+typedef struct bd_dir_s BD_DIR_H;
+struct bd_dir_s
+{
+ void* internal;
+ void (*close)(BD_DIR_H *dir);
+ int (*read)(BD_DIR_H *dir, BD_DIRENT *entry);
+};
+
+typedef struct bd_disc BD_DISC;
+
+struct bd_disc {
+ BD_MUTEX ovl_mutex; /* protect access to overlay root */
+ BD_MUTEX properties_mutex; /* protect access to properties file */
+
+ char *disc_root; /* disc filesystem root (if disc is mounted) */
+ char *overlay_root; /* overlay filesystem root (if set) */
+
+ BD_DEC *dec;
+
+ void *fs_handle;
+ BD_FILE_H * (*pf_file_open_bdrom)(void *, const char *);
+ BD_DIR_H * (*pf_dir_open_bdrom)(void *, const char *);
+ void (*pf_fs_close)(void *);
+
+ const char *udf_volid;
+ char *properties_file; /* NULL if not yet used */
+
+ int8_t avchd; /* -1 - unknown. 0 - no. 1 - yes */
+};
/*
WARNING!
@@ -97,6 +200,8 @@
return (AACS*)mmbd;
}
+static std::string *cxx_string_pointer; // declare a persistent file scope variable
+
AACS_PUBLIC int __cdecl aacs_open_device(AACS *aacs, const char *path, const char *keyfile_path)
{
if (keyfile_path) {
@@ -110,7 +215,8 @@
}
}
- if (mmbd_open((MMBD*)aacs,path)) {
+ const char * c_string_path = (*cxx_string_pointer).c_str(); // convert to the C string we're after
+ if (mmbd_open((MMBD*)aacs,c_string_path)) { // change path to c_string_path
return AACS_ERROR_CORRUPTED_DISC;
}
@@ -189,8 +295,11 @@
return (const uint8_t *)"mmbd_fake_aacs_get_bdj_root_cert_hash";
}
-AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, void* p)
+AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *bd_disc_structure_pointer, void* p)
{
+ BD_DISC bd_disc_structure = *reinterpret_cast<BD_DISC*>(bd_disc_structure_pointer); // Copy the BD_DISC structure
+
+ cxx_string_pointer = reinterpret_cast<std::string*>(bd_disc_structure.fs_handle); // Copy the C++ string object pointer of interest
}
static void* file_open = NULL;
--- a/libmmbd/src/aacs.h
+++ b/libmmbd/src/aacs.h
@@ -197,7 +197,7 @@
AACS_PUBLIC struct aacs_basic_cci * __cdecl aacs_get_basic_cci(AACS *, uint32_t title);
-AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, void* p);
+AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *bd_disc_structure_pointer, void* p);
AACS_PUBLIC void* __cdecl aacs_register_file(void* p);
#ifdef __cplusplus
--- q/libmmbd/src/bdplus.cpp
+++ b/libmmbd/src/bdplus.cpp
@@ -44,6 +44,12 @@
uint64_t offset;
} BDPLUS_CTX;
+// provide a minimal bdplus_set_fopen()
+AACS_PUBLIC BDPLUS_CTX* __cdecl bdplus_set_fopen(BDPLUS_CTX* ctx, void *bd_disc_structure_pointer, void* p)
+{
+ return ctx;
+}
+
/*
This function requires aacs_vid value produced by aacs_get_vid, not an actual disc VID.
*/
--- a/libmmbd/src/bdplus.h
+++ b/libmmbd/src/bdplus.h
@@ -29,6 +29,7 @@
extern "C" {
#endif
+AACS_PUBLIC BDPLUS_CTX* __cdecl bdplus_set_fopen(BDPLUS_CTX* ctx, void *bd_disc_structure_pointer, void* p);
AACS_PUBLIC BDPLUS_CTX* __cdecl bdplus_init(const char *path, const char *keyfile_path,const uint8_t* aacs_vid);
AACS_PUBLIC int __cdecl bdplus_free(BDPLUS_CTX* ctx);
--- a/libmmbd/src/libmmbd.vers
+++ b/libmmbd/src/libmmbd.vers
@@ -33,6 +33,7 @@
aacs_get_device_nonce;
aacs_get_bus_encryption;
aacs_register_file;
+ bdplus_set_fopen;
bdplus_init;
bdplus_free;
bdplus_set_title;
Code: Select all
wget http://www.makemkv.com/download/makemkv-bin-1.12.0.tar.gz
wget http://www.makemkv.com/download/makemkv-oss-1.12.0.tar.gz
sudo apt-get install build-essential pkg-config libc6-dev libssl-dev libexpat1-dev libavcodec-dev libgl1-mesa-dev libqt4-dev zlib1g-dev
tar -xzf makemkv-oss-1.12.0.tar.gz
cd ./makemkv-oss-1.12.0
sudo nano ./patch_file
---
paste Content from here:
http://makemkv.com/forum2/viewtopic.php?f=3&t=16824&sid=c50aa1bc707de1a23e41303bd756c447&start=15#p61629
---
patch -p1 < patch_file
./configure
make
sudo make install
cd ..
tar -xzf makemkv-bin-1.12.0.tar.gz
cd ./makemkv-bin-1.12.0
make
sudo make installI don't build makemkv as an addon, i build it in-tree using my own package.mk. Building the addon in an host distro involves to set-up a cross compile environment imho. Finally i'm glad to ear that your addon is workingchristian wrote:@TheUlpio
How do you build makemkv as an add-on to work in libreelec?
I compiled makemkv on ubuntu with the new patch in this thread. Then I copied the binary and the libmmbd in my existing add-on directory on libreelec. But its not working. I got the message playback is not possible because of AACS. What I´m doing wrong?
Edit: Its working now. I build the complete add-on with a new compiled makemkv-oss source.
It´s working with the latest Libreelec nightly.
