hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-14 10:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

SMK video playback now works again.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-15 21:47:45 -07:00
parent 43cb23b81a
commit 95f5cecc48
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/vqamovie.cpp
+10 -17
View File
@@ -6,11 +6,13 @@
#include "AUDIOMIX.H"
#include <SDL.h>
#include <ctime>
#include "image.h"
byte* raw_image_buffer = nullptr;
int vqa_upscale_hack_width = 0;
int vqa_upscale_hack_height = 0;
byte* vqa_output_buffer = nullptr;
Image_t* vqa_image = nullptr;
byte* VQA_Dropsample(const byte* in, int inwidth, int inheight, int outwidth, int outheight) {
int i, j, k;
@@ -80,9 +82,13 @@ long VQA_Open(_VQAHandle *videoHandle, char const* filename) {
smk_info_all(videoHandle->smacker_video, &frame, &videoHandle->frame_count, &usf);
smk_enable_all(videoHandle->smacker_video, 65536);
smk_info_audio(videoHandle->smacker_video, &videoHandle->track_mask, &videoHandle->channels[0], &videoHandle->bitdepth[0], &videoHandle->audio_rate[0]);
videoHandle->video_graphics_buffer = &VisiblePage;//new GraphicBufferClass();
if (vqa_output_buffer == nullptr)
vqa_output_buffer = new byte[ScreenWidth * ScreenHeight * 3];
vqa_output_buffer = new byte[ScreenWidth * ScreenHeight];
if (vqa_image == NULL)
{
vqa_image = Image_CreateBlankImage("_vqaimage", ScreenWidth, ScreenHeight);
}
//videoHandle->video_graphics_buffer->Init(videoHandle->width, videoHandle->height, NULL, 0, (GBC_Enum)(GBC_VISIBLE | GBC_VIDEOMEM));
@@ -125,24 +131,11 @@ long VQA_Play(_VQAHandle* vqaHandle) {
shouldSampleAudio = false;
}
//// Grab the frame from the movie.
//VQA_ImageForTime(vqaHandle, Sys_Milliseconds() - vqaHandle->startTime);
//
////memcpy(raw_image_buffer, vqaHandle->image, vqaHandle->CIN_WIDTH * vqaHandle->CIN_HEIGHT * 4 * 2);
//for (int i = 0; i < vqaHandle->CIN_WIDTH * vqaHandle->CIN_HEIGHT; i++) {
// raw_image_buffer[(i * 4) + 0] = vqaHandle->image[(i * 3) + 0];
// raw_image_buffer[(i * 4) + 1] = vqaHandle->image[(i * 3) + 1];
// raw_image_buffer[(i * 4) + 2] = vqaHandle->image[(i * 3) + 2];
//}
raw_image_buffer = smk_get_palette(vqaHandle->smacker_video);
Set_DD_Palette(raw_image_buffer, false);
vqaHandle->video_graphics_buffer->Lock();
VQA_Dropsample(smk_get_video(vqaHandle->smacker_video), vqaHandle->width, vqaHandle->height, ScreenWidth, ScreenHeight);
Buffer_To_Page(0, 0, ScreenWidth, ScreenHeight, vqa_output_buffer, *vqaHandle->video_graphics_buffer);
vqaHandle->video_graphics_buffer->Unlock();
Image_UploadRaw(vqa_image, vqa_output_buffer, true, raw_image_buffer);
GL_RenderImage(vqa_image, 0, 0, ScreenWidth, ScreenHeight);
Device_Present();
code/redalert/vqamovie.h
-2
View File
@@ -21,8 +21,6 @@ struct _VQAHandle {
_VQAHandle();
~_VQAHandle();
GraphicBufferClass* video_graphics_buffer;
unsigned long width;
unsigned long height;
unsigned long frame_count;
code/redalert/winstub.cpp
+3 -3
View File
@@ -332,9 +332,9 @@ void Image_UploadRaw(Image_t* image, uint8_t* data, bool paletteRebuild, uint8_t
for (int i = 0; i < image->width * image->height; i++) {
unsigned char c = data[i];
unsigned char r = palette[(c * 3) + 0] << 2;
unsigned char g = palette[(c * 3) + 1] << 2;
unsigned char b = palette[(c * 3) + 2] << 2;
unsigned char r = palette[(c * 3) + 0];
unsigned char g = palette[(c * 3) + 1];
unsigned char b = palette[(c * 3) + 2];
image->ScratchBuffer[(i * 4) + 0] = r;
image->ScratchBuffer[(i * 4) + 1] = g;