Commit 2a196b81 authored by Daniel Fort's avatar Daniel Fort
Browse files

lossless: support for 70D.112 from nikfreak and esas (from pull request #889)

Not working yet (black level issues)

--HG--
branch : crop_rec_4k
parent 138f36287673
......@@ -173,6 +173,19 @@ int lossless_init()
TTL_Finish = (void *) 0xFF412A9C;
}
if (is_camera("70D", "1.1.2"))
{
/* ProcessTwoInTwoOutLosslessPath, 70D 1.1.2 */
TTL_SetArgs = (void *) 0xFF362174; /* fills TTL_Args struct; PictureSize(Mem1ToRaw) */
TTL_Prepare = (void *) 0xFF438404; /* called right after ProcessTwoInTwoOutLosslessPath(R) Start; */
/* calls [TTL] GetPathResources and sets up the encoder for RAW/SRAW/MRAW */
TTL_RegisterCBR = (void *) 0xFF43748C; /* RegisterTwoInTwoOutLosslessPathCompleteCBR */
TTL_SetFlags = (void *) 0xFF372AE8; /* called next, with PictureType as arguments */
TTL_Start = (void *) 0xFF438474; /* called next; starts the EDmac transfers */
TTL_Stop = (void *) 0xFF4384AC; /* called right after sssStopMem1ToRawPath */
TTL_Finish = (void *) 0xFF4384E4; /* called next; calls UnlockEngineResources and returns output size from JpCoreCompleteCBR */
}
lossless_sem = create_named_semaphore(0, 0);
if (is_camera("700D", "*") || is_camera("650D", "*") || is_camera("EOSM", "*") || is_camera("100D", "*"))
......@@ -198,7 +211,7 @@ int lossless_init()
TTL_ResLock = CreateResLockEntry(resources, COUNT(resources));
}
else if (is_camera("5D3", "*") || is_camera("6D", "*"))
else if (is_camera("5D3", "*") || is_camera("6D", "*") || is_camera("70D", "*"))
{
uint32_t resources[] = {
0x00000 | edmac_channel_to_index(edmac_write_chan),
......@@ -494,6 +507,13 @@ static void decompress_init()
Cleanup_DecodeLosslessPath = (void *) 0xFF409444;
}
if (is_camera("70D", "1.1.2"))
{
Setup_DecodeLosslessRawPath = (void *) 0xFF4309A4;
Start_DecodeLosslessPath = (void *) 0xFF430A6C;
Cleanup_DecodeLosslessPath = (void *) 0xFF430BD0;
}
/* all functions known? having the semaphore is an indicator we can decompress */
if (Setup_DecodeLosslessRawPath && Start_DecodeLosslessPath && Cleanup_DecodeLosslessPath)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment