X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilejpeg.C;h=8c5687cc4f5badc79b6f25bc47e4c815d38c37ab;hb=066bf914215f31bbfe598f2cbce10d130f7fc519;hp=1eac64c74d5e5ee6402fb8b32939183bd1a0c7f0;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/filejpeg.C b/cinelerra-5.1/cinelerra/filejpeg.C index 1eac64c7..8c5687cc 100644 --- a/cinelerra-5.1/cinelerra/filejpeg.C +++ b/cinelerra-5.1/cinelerra/filejpeg.C @@ -48,41 +48,35 @@ FileJPEG::~FileJPEG() int FileJPEG::check_sig(Asset *asset) { - FILE *stream = fopen(asset->path, "rb"); - - if(stream) - { - char test[10]; - (void)fread(test, 10, 1, stream); - fclose(stream); - - if(test[6] == 'J' && test[7] == 'F' && test[8] == 'I' && test[9] == 'F') - { - return 1; + FILE *fp = fopen(asset->path, "r"); + if( !fp ) return 0; + char test[10]; + int result = -1; + if( fread(test, 1, sizeof(test), fp) == sizeof(test) ) { + if( test[6] == 'J' && test[7] == 'F' && test[8] == 'I' && test[9] == 'F' ) { + fseek(fp, 0, SEEK_SET); + int w = 0, h = 0; + result = read_header(fp, w, h); } - else - if(test[0] == 'J' && test[1] == 'P' && test[2] == 'E' && test[3] == 'G' && - test[4] == 'L' && test[5] == 'I' && test[6] == 'S' && test[7] == 'T') - { - return 1; + else if(test[0] == 'J' && test[1] == 'P' && test[2] == 'E' && test[3] == 'G' && + test[4] == 'L' && test[5] == 'I' && test[6] == 'S' && test[7] == 'T') { + result = 0; } } + fclose(fp); - if(strlen(asset->path) > 4) - { - int len = strlen(asset->path); - if(!strncasecmp(asset->path + len - 4, ".jpg", 4)) return 1; + if( result < 0 ) { + int i = strlen(asset->path) - 4; + if( i >= 0 && !strcasecmp(asset->path+i, ".jpg") ) + result = 0; } - return 0; + return !result ? 1 : 0; } - void FileJPEG::get_parameters(BC_WindowBase *parent_window, - Asset *asset, - BC_WindowBase* &format_window, - int audio_options, - int video_options) + Asset *asset, BC_WindowBase* &format_window, + int audio_options, int video_options, EDL *edl) { if(video_options) { @@ -167,6 +161,59 @@ int FileJPEG::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit) frame->get_color_model(), 1); +// insert spherical tag + if(asset->jpeg_sphere) + { + const char *sphere_tag = + "http://ns.adobe.com/xap/1.0/\x00\n" + "\n" + "\n" + "\n" + " \n" + " equirectangular\n" + " \n" + "\n" + "\n" + ""; + +// calculate length by skipping the \x00 byte + int skip = 32; + int tag_len = strlen(sphere_tag + skip) + skip; + int tag_len2 = tag_len + 2; + int tag_len3 = tag_len + 4; + + data->allocate_compressed_data( + mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor) + tag_len3); + data->set_compressed_size( + mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor) + tag_len3); + + int jfif_size = 0x14; + uint8_t *ptr = data->get_data(); + memcpy(ptr, + mjpeg_output_buffer((mjpeg_t*)jpeg_unit->compressor), + jfif_size); + ptr += jfif_size; + *ptr++ = 0xff; + *ptr++ = 0xe1; + *ptr++ = (tag_len2 >> 8) & 0xff; + *ptr++ = tag_len2 & 0xff; + memcpy(ptr, + sphere_tag, + tag_len); + ptr += tag_len; + memcpy(ptr, + mjpeg_output_buffer((mjpeg_t*)jpeg_unit->compressor) + jfif_size, + mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor) - jfif_size); + } + else + { + data->allocate_compressed_data(mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor)); + data->set_compressed_size(mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor)); + memcpy(data->get_data(), + mjpeg_output_buffer((mjpeg_t*)jpeg_unit->compressor), + mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor)); + } data->allocate_compressed_data(mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor)); data->set_compressed_size(mjpeg_output_size((mjpeg_t*)jpeg_unit->compressor)); memcpy(data->get_data(), @@ -187,51 +234,49 @@ int FileJPEG::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit) int FileJPEG::read_frame_header(char *path) { - int result = 0; - - - FILE *stream; - - if(!(stream = fopen(path, "rb"))) - { + FILE *fp = fopen(path, "rb"); + if( !fp ) { eprintf("FileJPEG::read_frame_header %s: %m\n", path); return 1; } - - + int w = 0, h = 0, result = 1; unsigned char test[2]; - (void)fread(test, 2, 1, stream); - if(test[0] != 0xff || test[1] != 0xd8) - { - eprintf("FileJPEG::read_frame_header %s bad header %02x%02x\n", - path, test[0], test[1]); - fclose(stream); - return 1; + if( fread(test, 1, sizeof(test), fp) == sizeof(test) && + test[0] == 0xff && test[1] == 0xd8 ) { + fseek(fp, 0, SEEK_SET); + result = read_header(fp, w, h); } - fseek(stream, 0, SEEK_SET); + fclose(fp); + if( !result ) { + asset->width = w; asset->height = h; + asset->interlace_mode = ILACE_MODE_NOTINTERLACED; + } + else + eprintf("FileJPEG::read_frame_header %s bad header\n", path); + return result; +} - struct jpeg_decompress_struct jpeg_decompress; +int FileJPEG::read_header(FILE *fp, int &w, int &h) +{ + int result = 0; struct jpeg_error_mgr jpeg_error; - + struct jpeg_decompress_struct jpeg_decompress; jpeg_decompress.err = jpeg_std_error(&jpeg_error); jpeg_create_decompress(&jpeg_decompress); - - jpeg_stdio_src(&jpeg_decompress, stream); - jpeg_read_header(&jpeg_decompress, TRUE); - - asset->width = jpeg_decompress.image_width; - asset->height = jpeg_decompress.image_height; - - asset->interlace_mode = ILACE_MODE_NOTINTERLACED; - + jpeg_stdio_src(&jpeg_decompress, fp); + if( jpeg_read_header(&jpeg_decompress, TRUE) != JPEG_HEADER_OK ) result = 1; + if( !result && jpeg_decompress.jpeg_color_space != JCS_YCbCr ) result = 1; + if( !result && jpeg_decompress.comp_info[0].h_samp_factor > 2 ) result = 1; + if( !result && jpeg_decompress.comp_info[0].v_samp_factor > 2 ) result = 1; + if( !result ) { + w = jpeg_decompress.image_width; + h = jpeg_decompress.image_height; + } jpeg_destroy((j_common_ptr)&jpeg_decompress); - fclose(stream); - return result; } - int FileJPEG::read_frame(VFrame *output, VFrame *input) { if(input->get_compressed_size() < 2 || @@ -301,7 +346,7 @@ JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), 400, - 100) + 200) { this->parent_window = parent_window; this->asset = asset; @@ -316,17 +361,13 @@ void JPEGConfigVideo::create_objects() int x = 10, y = 10; lock_window("JPEGConfigVideo::create_objects"); add_subwindow(new BC_Title(x, y, _("Quality:"))); - add_subwindow(new BC_ISlider(x + 80, - y, - 0, - 200, - 200, - 0, - 100, - asset->jpeg_quality, - 0, - 0, + BC_ISlider *slider; + add_subwindow(slider = new BC_ISlider(x + 80, y, + 0, 200, 200, 0, 100, asset->jpeg_quality, 0, 0, &asset->jpeg_quality)); + y += slider->get_h() + 10; + add_subwindow(new BC_CheckBox(x, y, + &asset->jpeg_sphere, _("Tag for spherical playback"))); add_subwindow(new BC_OKButton(this)); show_window(1);