Commit cd74a384 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

Edit two Exif fields 

HostComputer exif field was replaced with CameraSerialNumber and IPTCNAA
field was replaced with ImageNumber.
parent a2a841fa

src/drivers/elphel/sensor_common.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ static struct meta_offsets_t { // works like a cache to time save on looking for 
	int Image_DateTime;          // will have offset of the Exif_Image_DateTime data in meta page (Exif_Photo_SubSecTime should go immediately after in meta page)

	int Image_DateTime;          // will have offset of the Exif_Image_DateTime data in meta page (Exif_Photo_SubSecTime should go immediately after in meta page)

	int Photo_DateTimeOriginal;

	int Photo_DateTimeOriginal;

	int Photo_ExposureTime;

	int Photo_ExposureTime;

	int Image_FrameNumber;

	int Image_ImageNumber;

	int Image_Orientation;

	int Image_Orientation;

	int Photo_MakerNote;

	int Photo_MakerNote;

	int PageNumber;

	int PageNumber;
@@ -434,7 +434,7 @@ inline void updateIRQ_Exif(struct jpeg_ptr_t *jptr, struct interframe_params_t* 
	write_meta_irq(sensor_port, exif_meta_time_string, &meta_offsets.Photo_DateTimeOriginal,  Exif_Photo_DateTimeOriginal, 27);

	write_meta_irq(sensor_port, exif_meta_time_string, &meta_offsets.Photo_DateTimeOriginal,  Exif_Photo_DateTimeOriginal, 27);

	write_meta_irq(sensor_port, exif_meta_time_string, &meta_offsets.Image_DateTime,  Exif_Image_DateTime, 20); // may use 27 if room is provided

	write_meta_irq(sensor_port, exif_meta_time_string, &meta_offsets.Image_DateTime,  Exif_Image_DateTime, 20); // may use 27 if room is provided

	putlong_meta_irq(sensor_port, get_imageParamsThis(sensor_port, P_EXPOS), &meta_offsets.Photo_ExposureTime,  Exif_Photo_ExposureTime);

	putlong_meta_irq(sensor_port, get_imageParamsThis(sensor_port, P_EXPOS), &meta_offsets.Photo_ExposureTime,  Exif_Photo_ExposureTime);

	putlong_meta_irq(sensor_port, get_imageParamsThis(sensor_port, P_FRAME), &meta_offsets.Image_FrameNumber,   Exif_Image_FrameNumber);

	putlong_meta_irq(sensor_port, get_imageParamsThis(sensor_port, P_FRAME), &meta_offsets.Image_ImageNumber,   Exif_Image_ImageNumber);

	//Exif_Photo_MakerNote

	//Exif_Photo_MakerNote

	int global_flips=(get_imageParamsThis(sensor_port, P_FLIPH) & 1) | ((get_imageParamsThis(sensor_port, P_FLIPV)<<1)  & 2);

	int global_flips=(get_imageParamsThis(sensor_port, P_FLIPH) & 1) | ((get_imageParamsThis(sensor_port, P_FLIPV)<<1)  & 2);

	int extra_flips=0;

	int extra_flips=0;

src/include/elphel/exifa.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -61,11 +61,10 @@ struct exif_dir_table_t { 
#define  Exif_Image_Software           0x00131

#define  Exif_Image_Software           0x00131

#define  Exif_Image_DateTime           0x00132

#define  Exif_Image_DateTime           0x00132

#define  Exif_Image_Artist             0x0013b

#define  Exif_Image_Artist             0x0013b

#define  Exif_Image_HostComputer       0x0013c

#define  Exif_Image_CameraSerialNumber 0x0c62f

#define  Exif_Image_Orientation        0x00112

#define  Exif_Image_Orientation        0x00112

// hack, reusing field to keep it protected

// used for frame number as defined in Exif specification

#define  Exif_Image_IPTCNAA            0x083bb

#define  Exif_Image_ImageNumber        0x09211

#define  Exif_Image_FrameNumber        0x083bb

// used for sensor number

// used for sensor number

#define  Exif_Image_PageNumber         0x00129

#define  Exif_Image_PageNumber         0x00129
@@ -178,7 +177,7 @@ struct meta_CompassInfo_t { 
#define  Exif_GPSInfo_CompassPitch_Index        0x10

#define  Exif_GPSInfo_CompassPitch_Index        0x10

#define  Exif_GPSInfo_CompassRollRef_Index      0x11

#define  Exif_GPSInfo_CompassRollRef_Index      0x11

#define  Exif_GPSInfo_CompassRoll_Index         0x12

#define  Exif_GPSInfo_CompassRoll_Index         0x12

#define  Exif_Image_FrameNumber_Index           0x13

#define  Exif_Image_ImageNumber_Index           0x13

#define  Exif_Image_Orientation_Index           0x14

#define  Exif_Image_Orientation_Index           0x14

#define  Exif_Image_PageNumber_Index            0x15

#define  Exif_Image_PageNumber_Index            0x15

#define  Exif_Photo_MakerNote_Index             0x16

#define  Exif_Photo_MakerNote_Index             0x16